diff --git a/src/v3/compiler/src/bootstrap.rs b/src/v3/compiler/src/bootstrap.rs
index 99bf5c8fef7..e7d0a5e80e1 100644
--- a/src/v3/compiler/src/bootstrap.rs
+++ b/src/v3/compiler/src/bootstrap.rs
@@ -100,6 +100,7 @@ pub const BOOTSTRAP_FIXTURE_PATH_KEYS: &[&str] = &[
     "src/v3/std/python_method_template_contracts.dag",
     "src/v3/std/go_method_template_contracts.dag",
     "src/v3/std/anthropic_operations.dag",
+    "src/v3/std/cross_target_coverage.dag",
 ];
 
 /// v3-only inhabitance for kernel `Bool` (Class 5 / Lane 1e-2b Path A).
diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs
index 2d2ab21f3b0..20d413716df 100644
--- a/src/v3/compiler/src/bootstrap_generated.rs
+++ b/src/v3/compiler/src/bootstrap_generated.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         ports: bootstrapped_fixture_dag_ports(),
         diagnostics: bootstrapped_fixture_dag_diagnostics(),
         next_node_id: 315,
-        next_declaration_id: 2360,
+        next_declaration_id: 2383,
         next_port_id: 420,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag {
         emit_model_variants: EmitModelVariants::default(),
         clusters: bootstrapped_fixture_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2360,
+        declaration_append_begin_after_bootstrap: 2383,
     }
 }
 
@@ -119,21 +119,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(7),
-            target: TransformTarget::Callable(DeclarationId(1777)),
+            target: TransformTarget::Callable(DeclarationId(1784)),
             inputs: vec![PortId(9)],
             output: PortId(11),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11303, 11315),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(8),
-            target: TransformTarget::Callable(DeclarationId(1779)),
+            target: TransformTarget::Callable(DeclarationId(1786)),
             inputs: vec![PortId(11)],
             output: PortId(12),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11296, 11343),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(9),
-            target: TransformTarget::Callable(DeclarationId(1733)),
+            target: TransformTarget::Callable(DeclarationId(1740)),
             inputs: vec![PortId(9), PortId(10), PortId(12)],
             output: PortId(13),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10957, 11347),
@@ -149,7 +149,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(11),
-            target: TransformTarget::Callable(DeclarationId(1735)),
+            target: TransformTarget::Callable(DeclarationId(1742)),
             inputs: vec![PortId(14), PortId(15), PortId(16)],
             output: PortId(17),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11478, 11534),
@@ -165,7 +165,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(13),
-            target: TransformTarget::Callable(DeclarationId(1780)),
+            target: TransformTarget::Callable(DeclarationId(1787)),
             inputs: vec![PortId(18)],
             output: PortId(19),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11603, 11618),
@@ -318,7 +318,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(27),
-            target: TransformTarget::Callable(DeclarationId(1773)),
+            target: TransformTarget::Callable(DeclarationId(1780)),
             inputs: vec![PortId(35)],
             output: PortId(36),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12133, 12157),
@@ -348,7 +348,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(31),
-            target: TransformTarget::Callable(DeclarationId(1771)),
+            target: TransformTarget::Callable(DeclarationId(1778)),
             inputs: vec![PortId(40)],
             output: PortId(41),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12426, 12461),
@@ -478,14 +478,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(43),
-            target: TransformTarget::Callable(DeclarationId(1767)),
+            target: TransformTarget::Callable(DeclarationId(1774)),
             inputs: vec![PortId(54)],
             output: PortId(55),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14022, 14037),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(44),
-            target: TransformTarget::Callable(DeclarationId(1782)),
+            target: TransformTarget::Callable(DeclarationId(1789)),
             inputs: vec![PortId(53), PortId(55)],
             output: PortId(56),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14010, 14053),
@@ -1195,7 +1195,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(91),
-            target: TransformTarget::Callable(DeclarationId(1784)),
+            target: TransformTarget::Callable(DeclarationId(1791)),
             inputs: vec![PortId(136), PortId(137)],
             output: PortId(138),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16719, 16829),
@@ -1223,7 +1223,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(95),
-            target: TransformTarget::Callable(DeclarationId(1786)),
+            target: TransformTarget::Callable(DeclarationId(1793)),
             inputs: vec![PortId(141), PortId(142)],
             output: PortId(143),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16884, 16994),
@@ -1533,7 +1533,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             id: NodeId(114),
             target: TransformTarget::FieldProject {
                 field_label: "rest".to_string(),
-                field_child: Some(DeclarationId(1547)),
+                field_child: Some(DeclarationId(1554)),
             },
             inputs: vec![PortId(162)],
             output: PortId(165),
@@ -1541,14 +1541,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(115),
-            target: TransformTarget::Callable(DeclarationId(1787)),
+            target: TransformTarget::Callable(DeclarationId(1794)),
             inputs: vec![PortId(164), PortId(165)],
             output: PortId(166),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18445, 18475),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(116),
-            target: TransformTarget::Callable(DeclarationId(1788)),
+            target: TransformTarget::Callable(DeclarationId(1795)),
             inputs: vec![PortId(163), PortId(166)],
             output: PortId(167),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18427, 18476),
@@ -1564,7 +1564,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(118),
-            target: TransformTarget::Callable(DeclarationId(1789)),
+            target: TransformTarget::Callable(DeclarationId(1796)),
             inputs: vec![],
             output: PortId(169),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18755, 18762),
@@ -1632,7 +1632,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(126),
-            target: TransformTarget::Callable(DeclarationId(1790)),
+            target: TransformTarget::Callable(DeclarationId(1797)),
             inputs: vec![PortId(175), PortId(177)],
             output: PortId(178),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18889, 18941),
@@ -1728,21 +1728,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(133),
-            target: TransformTarget::Callable(DeclarationId(1767)),
+            target: TransformTarget::Callable(DeclarationId(1774)),
             inputs: vec![PortId(184)],
             output: PortId(185),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19275, 19290),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(134),
-            target: TransformTarget::Callable(DeclarationId(1791)),
+            target: TransformTarget::Callable(DeclarationId(1798)),
             inputs: vec![],
             output: PortId(186),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19292, 19299),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(135),
-            target: TransformTarget::Callable(DeclarationId(1792)),
+            target: TransformTarget::Callable(DeclarationId(1799)),
             inputs: vec![PortId(185), PortId(186)],
             output: PortId(187),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19270, 19300),
@@ -1881,7 +1881,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(147),
-            target: TransformTarget::Callable(DeclarationId(1793)),
+            target: TransformTarget::Callable(DeclarationId(1800)),
             inputs: vec![],
             output: PortId(200),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19749, 19756),
@@ -1949,7 +1949,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(155),
-            target: TransformTarget::Callable(DeclarationId(1794)),
+            target: TransformTarget::Callable(DeclarationId(1801)),
             inputs: vec![PortId(206), PortId(208)],
             output: PortId(209),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19887, 19944),
@@ -2354,7 +2354,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(181),
-            target: TransformTarget::Callable(DeclarationId(1767)),
+            target: TransformTarget::Callable(DeclarationId(1774)),
             inputs: vec![PortId(248)],
             output: PortId(249),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21332, 21347),
@@ -2401,7 +2401,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-            target: TransformTarget::Callable(DeclarationId(1795)),
+            target: TransformTarget::Callable(DeclarationId(1802)),
             inputs: vec![PortId(254), PortId(255)],
             output: PortId(256),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21469, 21501),
@@ -2498,7 +2498,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(193),
-            target: TransformTarget::Callable(DeclarationId(1767)),
+            target: TransformTarget::Callable(DeclarationId(1774)),
             inputs: vec![PortId(262)],
             output: PortId(263),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21603, 21618),
@@ -2562,7 +2562,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(200),
-            target: TransformTarget::Callable(DeclarationId(1773)),
+            target: TransformTarget::Callable(DeclarationId(1780)),
             inputs: vec![PortId(271)],
             output: PortId(272),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21721, 21780),
@@ -2645,7 +2645,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(205),
-            target: TransformTarget::Callable(DeclarationId(1767)),
+            target: TransformTarget::Callable(DeclarationId(1774)),
             inputs: vec![PortId(276)],
             output: PortId(277),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22069, 22084),
@@ -2746,7 +2746,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(216),
-            target: TransformTarget::Callable(DeclarationId(1771)),
+            target: TransformTarget::Callable(DeclarationId(1778)),
             inputs: vec![PortId(290)],
             output: PortId(291),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22311, 22374),
@@ -3218,7 +3218,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(245),
-            target: TransformTarget::Callable(DeclarationId(1771)),
+            target: TransformTarget::Callable(DeclarationId(1778)),
             inputs: vec![PortId(340)],
             output: PortId(341),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23757, 23785),
@@ -3313,7 +3313,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(256),
-            target: TransformTarget::Callable(DeclarationId(1796)),
+            target: TransformTarget::Callable(DeclarationId(1803)),
             inputs: vec![],
             output: PortId(354),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24140, 24147),
@@ -3381,7 +3381,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(264),
-            target: TransformTarget::Callable(DeclarationId(1797)),
+            target: TransformTarget::Callable(DeclarationId(1804)),
             inputs: vec![PortId(360), PortId(362)],
             output: PortId(363),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24288, 24353),
@@ -3470,7 +3470,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-            target: TransformTarget::Callable(DeclarationId(1799)),
+            target: TransformTarget::Callable(DeclarationId(1806)),
             inputs: vec![PortId(367), PortId(369)],
             output: PortId(370),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24471, 24529),
@@ -3491,7 +3491,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(273),
-            target: TransformTarget::Callable(DeclarationId(1800)),
+            target: TransformTarget::Callable(DeclarationId(1807)),
             inputs: vec![PortId(368), PortId(372)],
             output: PortId(373),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24555, 24601),
@@ -3534,14 +3534,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(276),
-            target: TransformTarget::Callable(DeclarationId(1801)),
+            target: TransformTarget::Callable(DeclarationId(1808)),
             inputs: vec![],
             output: PortId(376),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24872, 24879),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(277),
-            target: TransformTarget::Callable(DeclarationId(1803)),
+            target: TransformTarget::Callable(DeclarationId(1810)),
             inputs: vec![PortId(375), PortId(376)],
             output: PortId(377),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24860, 24901),
@@ -3559,7 +3559,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
             id: NodeId(279),
             target: TransformTarget::FieldProject {
                 field_label: "nodes".to_string(),
-                field_child: Some(DeclarationId(1724)),
+                field_child: Some(DeclarationId(1731)),
             },
             inputs: vec![PortId(378)],
             output: PortId(379),
@@ -4127,7 +4127,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
     {
-        let mut declarations = Vec::with_capacity(2360);
+        let mut declarations = Vec::with_capacity(2383);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -16671,11 +16671,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1543),
+                        ty: DeclarationId(1550),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1545),
+                        ty: DeclarationId(1552),
                     },
                 ],
             },
@@ -16708,7 +16708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1513),
+                output: DeclarationId(1520),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(609)],
@@ -16739,8 +16739,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(610),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(611), DeclarationId(1514)],
-                output: DeclarationId(1515),
+                inputs: vec![DeclarationId(611), DeclarationId(1521)],
+                output: DeclarationId(1522),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(611)],
@@ -16772,7 +16772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(613)],
-                output: DeclarationId(1516),
+                output: DeclarationId(1523),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(613)],
@@ -16803,7 +16803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(614),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1517), DeclarationId(616), DeclarationId(1518)],
+                inputs: vec![DeclarationId(1524), DeclarationId(616), DeclarationId(1525)],
                 output: DeclarationId(616),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -16849,7 +16849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(617),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1519), DeclarationId(619), DeclarationId(1520)],
+                inputs: vec![DeclarationId(1526), DeclarationId(619), DeclarationId(1527)],
                 output: DeclarationId(619),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -16895,8 +16895,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(620),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1521), DeclarationId(1522)],
-                output: DeclarationId(1523),
+                inputs: vec![DeclarationId(1528), DeclarationId(1529)],
+                output: DeclarationId(1530),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(621)],
@@ -16927,8 +16927,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(622),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1524), DeclarationId(1525)],
-                output: DeclarationId(1526),
+                inputs: vec![DeclarationId(1531), DeclarationId(1532)],
+                output: DeclarationId(1533),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(623), DeclarationId(624)],
@@ -16973,8 +16973,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(625),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1527), DeclarationId(1528)],
-                output: DeclarationId(1529),
+                inputs: vec![DeclarationId(1534), DeclarationId(1535)],
+                output: DeclarationId(1536),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(626)],
@@ -17005,8 +17005,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(627),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1530), DeclarationId(1532)],
-                output: DeclarationId(1533),
+                inputs: vec![DeclarationId(1537), DeclarationId(1539)],
+                output: DeclarationId(1540),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(628), DeclarationId(629)],
@@ -17051,7 +17051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(630),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1534)],
+                inputs: vec![DeclarationId(1541)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -17083,7 +17083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(632),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1535)],
+                inputs: vec![DeclarationId(1542)],
                 output: DeclarationId(100),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -17154,8 +17154,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(636),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1536)],
-                output: DeclarationId(1538),
+                inputs: vec![DeclarationId(1543)],
+                output: DeclarationId(1545),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(637)],
@@ -17186,8 +17186,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(638),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1539), DeclarationId(81)],
-                output: DeclarationId(1541),
+                inputs: vec![DeclarationId(1546), DeclarationId(81)],
+                output: DeclarationId(1548),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(639)],
@@ -17218,7 +17218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(640),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1542), DeclarationId(641)],
+                inputs: vec![DeclarationId(1549), DeclarationId(641)],
                 output: DeclarationId(100),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -17313,7 +17313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1546),
+                        ty: DeclarationId(1553),
                     },
                 ],
             },
@@ -17356,7 +17356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1547),
+                        ty: DeclarationId(1554),
                     },
                 ],
             },
@@ -17391,11 +17391,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1562),
+                        ty: DeclarationId(1569),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1563),
+                        ty: DeclarationId(1570),
                     },
                 ],
             },
@@ -17415,7 +17415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1564),
+                    ty: DeclarationId(1571),
                 }],
             },
             type_params: vec![],
@@ -17435,11 +17435,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1566),
+                        ty: DeclarationId(1573),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1567),
+                        ty: DeclarationId(1574),
                     },
                 ],
             },
@@ -17460,11 +17460,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1568),
+                        ty: DeclarationId(1575),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1569),
+                        ty: DeclarationId(1576),
                     },
                 ],
             },
@@ -17519,7 +17519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(651)],
-                output: DeclarationId(1548),
+                output: DeclarationId(1555),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -17539,15 +17539,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1570),
+                        ty: DeclarationId(1577),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1571),
+                        ty: DeclarationId(1578),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1572),
+                        ty: DeclarationId(1579),
                     },
                 ],
             },
@@ -17568,11 +17568,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1573),
+                        ty: DeclarationId(1580),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1574),
+                        ty: DeclarationId(1581),
                     },
                 ],
             },
@@ -17593,11 +17593,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1575),
+                        ty: DeclarationId(1582),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1576),
+                        ty: DeclarationId(1583),
                     },
                 ],
             },
@@ -17618,11 +17618,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1577),
+                        ty: DeclarationId(1584),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1578),
+                        ty: DeclarationId(1585),
                     },
                 ],
             },
@@ -17643,15 +17643,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1579),
+                        ty: DeclarationId(1586),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1580),
+                        ty: DeclarationId(1587),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1582),
+                        ty: DeclarationId(1589),
                     },
                 ],
             },
@@ -17672,15 +17672,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1583),
+                        ty: DeclarationId(1590),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1584),
+                        ty: DeclarationId(1591),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1585),
+                        ty: DeclarationId(1592),
                     },
                 ],
             },
@@ -17762,15 +17762,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1586),
+                        ty: DeclarationId(1593),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1587),
+                        ty: DeclarationId(1594),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1588),
+                        ty: DeclarationId(1595),
                     },
                 ],
             },
@@ -17791,11 +17791,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1589),
+                        ty: DeclarationId(1596),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1591),
+                        ty: DeclarationId(1598),
                     },
                 ],
             },
@@ -17832,7 +17832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(1549),
+                output: DeclarationId(1556),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
             },
             type_params: vec![],
@@ -17849,8 +17849,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(670),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1550)],
-                output: DeclarationId(1552),
+                inputs: vec![DeclarationId(1557)],
+                output: DeclarationId(1559),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
             },
             type_params: vec![],
@@ -17867,8 +17867,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(671),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1553)],
-                output: DeclarationId(1555),
+                inputs: vec![DeclarationId(1560)],
+                output: DeclarationId(1562),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
             },
             type_params: vec![],
@@ -17885,7 +17885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(672),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1556)],
+                inputs: vec![DeclarationId(1563)],
                 output: DeclarationId(667),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
             },
@@ -17950,19 +17950,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1593),
+                        ty: DeclarationId(1600),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1595),
+                        ty: DeclarationId(1602),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1596),
+                        ty: DeclarationId(1603),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1598),
+                        ty: DeclarationId(1605),
                     },
                 ],
             },
@@ -18012,11 +18012,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1599),
+                        ty: DeclarationId(1606),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1600),
+                        ty: DeclarationId(1607),
                     },
                 ],
             },
@@ -18055,23 +18055,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1601),
+                        ty: DeclarationId(1608),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1602),
+                        ty: DeclarationId(1609),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1603),
+                        ty: DeclarationId(1610),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1604),
+                        ty: DeclarationId(1611),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1605),
+                        ty: DeclarationId(1612),
                     },
                 ],
             },
@@ -18121,11 +18121,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1606),
+                        ty: DeclarationId(1613),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1607),
+                        ty: DeclarationId(1614),
                     },
                 ],
             },
@@ -18180,7 +18180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(1557),
+                output: DeclarationId(1564),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
             },
             type_params: vec![],
@@ -18215,7 +18215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(686),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1558), DeclarationId(167)],
+                inputs: vec![DeclarationId(1565), DeclarationId(167)],
                 output: DeclarationId(659),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
             },
@@ -18233,7 +18233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(687),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1559), DeclarationId(167)],
+                inputs: vec![DeclarationId(1566), DeclarationId(167)],
                 output: DeclarationId(659),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
             },
@@ -18290,15 +18290,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1608),
+                        ty: DeclarationId(1615),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1609),
+                        ty: DeclarationId(1616),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1610),
+                        ty: DeclarationId(1617),
                     },
                 ],
             },
@@ -18319,11 +18319,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1611),
+                        ty: DeclarationId(1618),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1612),
+                        ty: DeclarationId(1619),
                     },
                 ],
             },
@@ -18461,8 +18461,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(697),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1560)],
-                output: DeclarationId(1561),
+                inputs: vec![DeclarationId(1567)],
+                output: DeclarationId(1568),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 37296, 37566)),
             },
             type_params: vec![],
@@ -18530,15 +18530,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1620),
+                        ty: DeclarationId(1627),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1621),
+                        ty: DeclarationId(1628),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1622),
+                        ty: DeclarationId(1629),
                     },
                 ],
             },
@@ -18567,7 +18567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1623),
+                        ty: DeclarationId(1630),
                     },
                 ],
             },
@@ -18588,15 +18588,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1624),
+                        ty: DeclarationId(1631),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1625),
+                        ty: DeclarationId(1632),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1626),
+                        ty: DeclarationId(1633),
                     },
                 ],
             },
@@ -18617,23 +18617,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1627),
+                        ty: DeclarationId(1634),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1628),
+                        ty: DeclarationId(1635),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1629),
+                        ty: DeclarationId(1636),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1630),
+                        ty: DeclarationId(1637),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1631),
+                        ty: DeclarationId(1638),
                     },
                 ],
             },
@@ -18654,15 +18654,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1632),
+                        ty: DeclarationId(1639),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1633),
+                        ty: DeclarationId(1640),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1634),
+                        ty: DeclarationId(1641),
                     },
                 ],
             },
@@ -18683,11 +18683,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1635),
+                        ty: DeclarationId(1642),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1636),
+                        ty: DeclarationId(1643),
                     },
                 ],
             },
@@ -18708,11 +18708,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1637),
+                        ty: DeclarationId(1644),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1638),
+                        ty: DeclarationId(1645),
                     },
                 ],
             },
@@ -18767,11 +18767,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1640),
+                        ty: DeclarationId(1647),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1641),
+                        ty: DeclarationId(1648),
                     },
                 ],
             },
@@ -18792,15 +18792,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1642),
+                        ty: DeclarationId(1649),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1643),
+                        ty: DeclarationId(1650),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1644),
+                        ty: DeclarationId(1651),
                     },
                 ],
             },
@@ -18896,27 +18896,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1645),
+                        ty: DeclarationId(1652),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1646),
+                        ty: DeclarationId(1653),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1648),
+                        ty: DeclarationId(1655),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1650),
+                        ty: DeclarationId(1657),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1652),
+                        ty: DeclarationId(1659),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1654),
+                        ty: DeclarationId(1661),
                     },
                 ],
             },
@@ -18937,15 +18937,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1655),
+                        ty: DeclarationId(1662),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1657),
+                        ty: DeclarationId(1664),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1659),
+                        ty: DeclarationId(1666),
                     },
                 ],
             },
@@ -18985,23 +18985,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1660),
+                        ty: DeclarationId(1667),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1661),
+                        ty: DeclarationId(1668),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1662),
+                        ty: DeclarationId(1669),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1663),
+                        ty: DeclarationId(1670),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1664),
+                        ty: DeclarationId(1671),
                     },
                 ],
             },
@@ -19022,27 +19022,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1665),
+                        ty: DeclarationId(1672),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1667),
+                        ty: DeclarationId(1674),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1669),
+                        ty: DeclarationId(1676),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1671),
+                        ty: DeclarationId(1678),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1672),
+                        ty: DeclarationId(1679),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1674),
+                        ty: DeclarationId(1681),
                     },
                 ],
             },
@@ -19067,7 +19067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1675),
+                        ty: DeclarationId(1682),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -19075,27 +19075,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1676),
+                        ty: DeclarationId(1683),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1677),
+                        ty: DeclarationId(1684),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1678),
+                        ty: DeclarationId(1685),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1679),
+                        ty: DeclarationId(1686),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1680),
+                        ty: DeclarationId(1687),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1681),
+                        ty: DeclarationId(1688),
                     },
                     Field {
                         label: "span".to_string(),
@@ -19144,7 +19144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1682),
+                    ty: DeclarationId(1689),
                 }],
             },
             type_params: vec![],
@@ -19164,19 +19164,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1683),
+                        ty: DeclarationId(1690),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1684),
+                        ty: DeclarationId(1691),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1685),
+                        ty: DeclarationId(1692),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1686),
+                        ty: DeclarationId(1693),
                     },
                 ],
             },
@@ -19197,27 +19197,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1687),
+                        ty: DeclarationId(1694),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1688),
+                        ty: DeclarationId(1695),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1689),
+                        ty: DeclarationId(1696),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1690),
+                        ty: DeclarationId(1697),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1691),
+                        ty: DeclarationId(1698),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1692),
+                        ty: DeclarationId(1699),
                     },
                 ],
             },
@@ -19238,11 +19238,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1693),
+                        ty: DeclarationId(1700),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1694),
+                        ty: DeclarationId(1701),
                     },
                 ],
             },
@@ -19263,15 +19263,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1695),
+                        ty: DeclarationId(1702),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1696),
+                        ty: DeclarationId(1703),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1697),
+                        ty: DeclarationId(1704),
                     },
                 ],
             },
@@ -19292,15 +19292,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1698),
+                        ty: DeclarationId(1705),
                     },
                     Field {
                         label: "FieldProject".to_string(),
-                        ty: DeclarationId(1700),
+                        ty: DeclarationId(1707),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1701),
+                        ty: DeclarationId(1708),
                     },
                 ],
             },
@@ -19321,11 +19321,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1702),
+                        ty: DeclarationId(1709),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1703),
+                        ty: DeclarationId(1710),
                     },
                 ],
             },
@@ -19383,7 +19383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1704),
+                        ty: DeclarationId(1711),
                     },
                 ],
             },
@@ -19519,11 +19519,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1705),
+                        ty: DeclarationId(1712),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1706),
+                        ty: DeclarationId(1713),
                     },
                 ],
             },
@@ -19544,11 +19544,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1707),
+                        ty: DeclarationId(1714),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1708),
+                        ty: DeclarationId(1715),
                     },
                 ],
             },
@@ -19603,7 +19603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1709),
+                        ty: DeclarationId(1716),
                     },
                 ],
             },
@@ -19632,7 +19632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1710),
+                        ty: DeclarationId(1717),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -19660,7 +19660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1711),
+                    ty: DeclarationId(1718),
                 }],
             },
             type_params: vec![],
@@ -19688,7 +19688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1712),
+                        ty: DeclarationId(1719),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -19700,7 +19700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1713),
+                        ty: DeclarationId(1720),
                     },
                 ],
             },
@@ -19765,7 +19765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1714),
+                    ty: DeclarationId(1721),
                 }],
             },
             type_params: vec![],
@@ -19797,7 +19797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1715),
+                        ty: DeclarationId(1722),
                     },
                     Field {
                         label: "span".to_string(),
@@ -19805,11 +19805,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1716),
+                        ty: DeclarationId(1723),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1717),
+                        ty: DeclarationId(1724),
                     },
                 ],
             },
@@ -19830,23 +19830,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1718),
+                        ty: DeclarationId(1725),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1719),
+                        ty: DeclarationId(1726),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1720),
+                        ty: DeclarationId(1727),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1721),
+                        ty: DeclarationId(1728),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1722),
+                        ty: DeclarationId(1729),
                     },
                 ],
             },
@@ -19867,19 +19867,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1723),
+                        ty: DeclarationId(1730),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1724),
+                        ty: DeclarationId(1731),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1725),
+                        ty: DeclarationId(1732),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(1726),
+                        ty: DeclarationId(1733),
                     },
                 ],
             },
@@ -19919,15 +19919,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "accessor".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -19946,7 +19946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(643)],
-                output: DeclarationId(1613),
+                output: DeclarationId(1620),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     19522,
@@ -19968,7 +19968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(642)],
-                output: DeclarationId(1614),
+                output: DeclarationId(1621),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     19580,
@@ -19990,7 +19990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(643)],
-                output: DeclarationId(1615),
+                output: DeclarationId(1622),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     19655,
@@ -20012,7 +20012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(644)],
-                output: DeclarationId(1616),
+                output: DeclarationId(1623),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     20044,
@@ -20034,7 +20034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(642)],
-                output: DeclarationId(1617),
+                output: DeclarationId(1624),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     20368,
@@ -20058,15 +20058,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(1727),
+                        ty: DeclarationId(1734),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(1728),
+                        ty: DeclarationId(1735),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(1730),
+                        ty: DeclarationId(1737),
                     },
                 ],
             },
@@ -20107,7 +20107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1618),
+                output: DeclarationId(1625),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24373,
@@ -20129,7 +20129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(644)],
-                output: DeclarationId(1619),
+                output: DeclarationId(1626),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24458,
@@ -20152,7 +20152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1120),
+                    ty: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
@@ -20172,15 +20172,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(1755),
+                        ty: DeclarationId(1762),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1756),
+                        ty: DeclarationId(1763),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1757),
+                        ty: DeclarationId(1764),
                     },
                 ],
             },
@@ -20201,19 +20201,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(1758),
+                        ty: DeclarationId(1765),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1759),
+                        ty: DeclarationId(1766),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1760),
+                        ty: DeclarationId(1767),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1761),
+                        ty: DeclarationId(1768),
                     },
                 ],
             },
@@ -20242,15 +20242,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(1762),
+                        ty: DeclarationId(1769),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(1763),
+                        ty: DeclarationId(1770),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1764),
+                        ty: DeclarationId(1771),
                     },
                 ],
             },
@@ -20290,11 +20290,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(1765),
+                        ty: DeclarationId(1772),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1766),
+                        ty: DeclarationId(1773),
                     },
                 ],
             },
@@ -20315,31 +20315,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(1767),
+                        ty: DeclarationId(1774),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(1768),
+                        ty: DeclarationId(1775),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1769),
+                        ty: DeclarationId(1776),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(1771),
+                        ty: DeclarationId(1778),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(1773),
+                        ty: DeclarationId(1780),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1774),
+                        ty: DeclarationId(1781),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1775),
+                        ty: DeclarationId(1782),
                     },
                 ],
             },
@@ -20347,7 +20347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1776)),
+            inhabits: Some(DeclarationId(1783)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -20401,7 +20401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1731),
+                output: DeclarationId(1738),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10771, 10781)),
             },
             type_params: vec![],
@@ -20419,7 +20419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("hit_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(765)],
-                output: DeclarationId(1732),
+                output: DeclarationId(1739),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10855, 10870)),
             },
             type_params: vec![],
@@ -20437,7 +20437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(765), DeclarationId(765)],
-                output: DeclarationId(1733),
+                output: DeclarationId(1740),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(10))),
             },
             type_params: vec![],
@@ -20454,8 +20454,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(771),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(765), DeclarationId(765), DeclarationId(1734)],
-                output: DeclarationId(1735),
+                inputs: vec![DeclarationId(765), DeclarationId(765), DeclarationId(1741)],
+                output: DeclarationId(1742),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(12))),
             },
             type_params: vec![],
@@ -20580,7 +20580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(778),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1736)],
+                inputs: vec![DeclarationId(1743)],
                 output: DeclarationId(765),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(45))),
             },
@@ -20652,8 +20652,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(782),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1737)],
-                output: DeclarationId(1738),
+                inputs: vec![DeclarationId(1744)],
+                output: DeclarationId(1745),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(117))),
             },
             type_params: vec![],
@@ -20670,8 +20670,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(783),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1739)],
-                output: DeclarationId(1740),
+                inputs: vec![DeclarationId(1746)],
+                output: DeclarationId(1747),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(130))),
             },
             type_params: vec![],
@@ -20688,8 +20688,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(784),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1741)],
-                output: DeclarationId(1742),
+                inputs: vec![DeclarationId(1748)],
+                output: DeclarationId(1749),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(137))),
             },
             type_params: vec![],
@@ -20706,7 +20706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(785),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1743)],
+                inputs: vec![DeclarationId(1750)],
                 output: DeclarationId(100),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(146))),
             },
@@ -20724,8 +20724,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(786),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1744)],
-                output: DeclarationId(1745),
+                inputs: vec![DeclarationId(1751)],
+                output: DeclarationId(1752),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(159))),
             },
             type_params: vec![],
@@ -20778,7 +20778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(789),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1746)],
+                inputs: vec![DeclarationId(1753)],
                 output: DeclarationId(765),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(191))),
             },
@@ -20796,7 +20796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(790),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1747)],
+                inputs: vec![DeclarationId(1754)],
                 output: DeclarationId(765),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(203))),
             },
@@ -20814,7 +20814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(791),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1748)],
+                inputs: vec![DeclarationId(1755)],
                 output: DeclarationId(765),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
@@ -20963,8 +20963,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(799),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1749), DeclarationId(765)],
-                output: DeclarationId(1750),
+                inputs: vec![DeclarationId(1756), DeclarationId(765)],
+                output: DeclarationId(1757),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(268))),
             },
             type_params: vec![],
@@ -20981,8 +20981,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(800),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1751), DeclarationId(765)],
-                output: DeclarationId(1752),
+                inputs: vec![DeclarationId(1758), DeclarationId(765)],
+                output: DeclarationId(1759),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(275))),
             },
             type_params: vec![],
@@ -20999,8 +20999,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(801),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1753)],
-                output: DeclarationId(1754),
+                inputs: vec![DeclarationId(1760)],
+                output: DeclarationId(1761),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(278))),
             },
             type_params: vec![],
@@ -21020,10 +21020,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 inputs: vec![
                     DeclarationId(119),
                     DeclarationId(197),
-                    DeclarationId(1804),
+                    DeclarationId(1811),
                     DeclarationId(81),
-                    DeclarationId(1805),
-                    DeclarationId(1806),
+                    DeclarationId(1812),
+                    DeclarationId(1813),
                 ],
                 output: DeclarationId(814),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -21049,12 +21049,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1066),
+                    value: DeclarationId(1073),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1807)),
+            meta_tag: Some(DeclarationId(1814)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -21069,11 +21069,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(1809),
+                        ty: DeclarationId(1816),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1811),
+                        ty: DeclarationId(1818),
                     },
                 ],
             },
@@ -21094,11 +21094,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-                        ty: DeclarationId(1812),
+                        ty: DeclarationId(1819),
                     },
                     Field {
                         label: "UrlImage".to_string(),
-                        ty: DeclarationId(1813),
+                        ty: DeclarationId(1820),
                     },
                 ],
             },
@@ -21119,11 +21119,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1821),
                     },
                     Field {
                         label: "ImageContent".to_string(),
-                        ty: DeclarationId(1815),
+                        ty: DeclarationId(1822),
                     },
                 ],
             },
@@ -21144,11 +21144,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-                        ty: DeclarationId(1816),
+                        ty: DeclarationId(1823),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(1818),
+                        ty: DeclarationId(1825),
                     },
                 ],
             },
@@ -21169,11 +21169,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(1819),
+                        ty: DeclarationId(1826),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1822),
+                        ty: DeclarationId(1829),
                     },
                 ],
             },
@@ -21194,11 +21194,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(1823),
+                        ty: DeclarationId(1830),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1824),
+                        ty: DeclarationId(1831),
                     },
                 ],
             },
@@ -21219,31 +21219,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(1825),
+                        ty: DeclarationId(1832),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1826),
+                        ty: DeclarationId(1833),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(1827),
+                        ty: DeclarationId(1834),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(1828),
+                        ty: DeclarationId(1835),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1829),
+                        ty: DeclarationId(1836),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(1830),
+                        ty: DeclarationId(1837),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1831),
+                        ty: DeclarationId(1838),
                     },
                 ],
             },
@@ -21264,23 +21264,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-                        ty: DeclarationId(1834),
+                        ty: DeclarationId(1841),
                     },
                     Field {
                         label: "PageLocation".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1844),
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(1840),
+                        ty: DeclarationId(1847),
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1849),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1851),
                     },
                 ],
             },
@@ -21309,7 +21309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1853),
                     },
                 ],
             },
@@ -21338,15 +21338,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1854),
                     },
                     Field {
                         label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1855),
                     },
                     Field {
                         label: "service_tier".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1856),
                     },
                 ],
             },
@@ -21379,7 +21379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1857),
                     },
                     Field {
                         label: "model".to_string(),
@@ -21391,7 +21391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "usage".to_string(),
@@ -21399,7 +21399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "container".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1859),
                     },
                 ],
             },
@@ -21420,23 +21420,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ToNearestEven".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "ToZero".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1861),
                     },
                     Field {
                         label: "ToPositiveInfinity".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1862),
                     },
                     Field {
                         label: "ToNegativeInfinity".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1863),
                     },
                     Field {
                         label: "ToAwayFromZero".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1864),
                     },
                 ],
             },
@@ -21457,15 +21457,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1865),
                     },
                     Field {
                         label: "BinaryPrecision".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1866),
                     },
                     Field {
                         label: "DecimalPrecision".to_string(),
-                        ty: DeclarationId(1860),
+                        ty: DeclarationId(1867),
                     },
                 ],
             },
@@ -21486,15 +21486,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoNaN".to_string(),
-                        ty: DeclarationId(1861),
+                        ty: DeclarationId(1868),
                     },
                     Field {
                         label: "QuietNaN".to_string(),
-                        ty: DeclarationId(1862),
+                        ty: DeclarationId(1869),
                     },
                     Field {
                         label: "QuietAndSignalingNaN".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1870),
                     },
                 ],
             },
@@ -21515,11 +21515,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoInfinity".to_string(),
-                        ty: DeclarationId(1864),
+                        ty: DeclarationId(1871),
                     },
                     Field {
                         label: "SignedInfinity".to_string(),
-                        ty: DeclarationId(1865),
+                        ty: DeclarationId(1872),
                     },
                 ],
             },
@@ -21540,11 +21540,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSignedZero".to_string(),
-                        ty: DeclarationId(1866),
+                        ty: DeclarationId(1873),
                     },
                     Field {
                         label: "SignedZero".to_string(),
-                        ty: DeclarationId(1867),
+                        ty: DeclarationId(1874),
                     },
                 ],
             },
@@ -21565,15 +21565,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "NoSubnormals".to_string(),
-                        ty: DeclarationId(1868),
+                        ty: DeclarationId(1875),
                     },
                     Field {
                         label: "GradualUnderflow".to_string(),
-                        ty: DeclarationId(1869),
+                        ty: DeclarationId(1876),
                     },
                     Field {
                         label: "FlushToZero".to_string(),
-                        ty: DeclarationId(1870),
+                        ty: DeclarationId(1877),
                     },
                 ],
             },
@@ -21623,7 +21623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1878),
                     },
                     Field {
                         label: "rounding".to_string(),
@@ -21682,7 +21682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "entry".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -21703,23 +21703,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-                        ty: DeclarationId(1872),
+                        ty: DeclarationId(1879),
                     },
                     Field {
                         label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(1873),
+                        ty: DeclarationId(1880),
                     },
                     Field {
                         label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1881),
                     },
                     Field {
                         label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(1875),
+                        ty: DeclarationId(1882),
                     },
                     Field {
                         label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(1876),
+                        ty: DeclarationId(1883),
                     },
                 ],
             },
@@ -21776,399 +21776,406 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/cross_target_coverage.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1874),
+                            constructor: DeclarationId(1881),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1874),
+                            constructor: DeclarationId(1881),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1874),
+                            constructor: DeclarationId(1881),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1874),
+                            constructor: DeclarationId(1881),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1875),
+                            constructor: DeclarationId(1882),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1875),
+                            constructor: DeclarationId(1882),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1875),
+                            constructor: DeclarationId(1882),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1876),
+                            constructor: DeclarationId(1883),
                             payload: vec![],
                         },
                     ),
@@ -22177,7 +22184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             )),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4240),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4300),
         });
         declarations.push(Declaration {
             id: DeclarationId(828),
@@ -22186,11 +22193,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(1877),
+                        ty: DeclarationId(1884),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(1878),
+                        ty: DeclarationId(1885),
                     },
                 ],
             },
@@ -22210,7 +22217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1120),
+                    ty: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
@@ -22256,7 +22263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5984, 6094),
         });
-        declarations.push(Declaration { id: DeclarationId(831), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(606), arguments: vec![TemplateArgument { parameter: DeclarationId(607), value: DeclarationId(830) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1879)), 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(1878), 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(1877), 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(1877), 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(1878), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1878), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1878), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) });
+        declarations.push(Declaration { id: DeclarationId(831), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(606), arguments: vec![TemplateArgument { parameter: DeclarationId(607), value: DeclarationId(830) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1886)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("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(1885), 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(1884), 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(1884), 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(1885), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1885), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1885), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) });
         declarations.push(Declaration {
             id: DeclarationId(832),
             name: Some("CleanEmissionContract".to_string()),
@@ -22317,7 +22324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(943),
+                        ty: DeclarationId(950),
                     },
                     Field {
                         label: "clean_emission".to_string(),
@@ -22342,15 +22349,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(1880),
+                        ty: DeclarationId(1887),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(1881),
+                        ty: DeclarationId(1888),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(1882),
+                        ty: DeclarationId(1889),
                     },
                 ],
             },
@@ -22371,19 +22378,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(1883),
+                        ty: DeclarationId(1890),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1884),
+                        ty: DeclarationId(1891),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1885),
+                        ty: DeclarationId(1892),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(1886),
+                        ty: DeclarationId(1893),
                     },
                 ],
             },
@@ -22404,11 +22411,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(1887),
+                        ty: DeclarationId(1894),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(1888),
+                        ty: DeclarationId(1895),
                     },
                 ],
             },
@@ -22429,15 +22436,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(1889),
+                        ty: DeclarationId(1896),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(1890),
+                        ty: DeclarationId(1897),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(1891),
+                        ty: DeclarationId(1898),
                     },
                 ],
             },
@@ -22458,15 +22465,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(1892),
+                        ty: DeclarationId(1899),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(1893),
+                        ty: DeclarationId(1900),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(1894),
+                        ty: DeclarationId(1901),
                     },
                 ],
             },
@@ -22487,15 +22494,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(1895),
+                        ty: DeclarationId(1902),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1896),
+                        ty: DeclarationId(1903),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1904),
                     },
                 ],
             },
@@ -22516,15 +22523,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1905),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1906),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1907),
                     },
                 ],
             },
@@ -22582,7 +22589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1908),
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -22615,19 +22622,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1909),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1910),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(1904),
+                        ty: DeclarationId(1911),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1912),
                     },
                 ],
             },
@@ -22648,35 +22655,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(1910),
+                        ty: DeclarationId(1917),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(1911),
+                        ty: DeclarationId(1918),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(1912),
+                        ty: DeclarationId(1919),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1920),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1921),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(1915),
+                        ty: DeclarationId(1922),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(1916),
+                        ty: DeclarationId(1923),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(1917),
+                        ty: DeclarationId(1924),
                     },
                 ],
             },
@@ -22716,7 +22723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             id: DeclarationId(846),
             name: Some("positive_descent_count".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1075)],
+                inputs: vec![DeclarationId(1082)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
@@ -22741,35 +22748,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1925),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1926),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1927),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(1921),
+                        ty: DeclarationId(1928),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1929),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(1923),
+                        ty: DeclarationId(1930),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1931),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(1925),
+                        ty: DeclarationId(1932),
                     },
                 ],
             },
@@ -22790,15 +22797,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(1926),
+                        ty: DeclarationId(1933),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(1927),
+                        ty: DeclarationId(1934),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(1928),
+                        ty: DeclarationId(1935),
                     },
                 ],
             },
@@ -22819,15 +22826,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1936),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1937),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1938),
                     },
                 ],
             },
@@ -22856,11 +22863,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(1067),
+                        ty: DeclarationId(1074),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(1932),
+                        ty: DeclarationId(1939),
                     },
                 ],
             },
@@ -22901,7 +22908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(844)],
-                output: DeclarationId(1906),
+                output: DeclarationId(1913),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5369,
@@ -22967,7 +22974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(844)],
-                output: DeclarationId(1907),
+                output: DeclarationId(1914),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6297,
@@ -22991,15 +22998,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(1933),
+                        ty: DeclarationId(1940),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1941),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(1935),
+                        ty: DeclarationId(1942),
                     },
                 ],
             },
@@ -23018,7 +23025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(1908),
+                output: DeclarationId(1915),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7370,
@@ -23040,7 +23047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(1909),
+                output: DeclarationId(1916),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7935,
@@ -23064,11 +23071,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(1936),
+                        ty: DeclarationId(1943),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1944),
                     },
                 ],
             },
@@ -23089,11 +23096,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1945),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1946),
                     },
                 ],
             },
@@ -23114,11 +23121,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1947),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(1941),
+                        ty: DeclarationId(1948),
                     },
                 ],
             },
@@ -23139,11 +23146,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1949),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1950),
                     },
                 ],
             },
@@ -23207,28 +23214,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1936),
+                            constructor: DeclarationId(1943),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1938),
+                            constructor: DeclarationId(1945),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1940),
+                            constructor: DeclarationId(1947),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1942),
+                            constructor: DeclarationId(1949),
                             payload: vec![],
                         },
                     ),
@@ -23245,19 +23252,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1951),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1945),
+                        ty: DeclarationId(1952),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1953),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1954),
                     },
                 ],
             },
@@ -23278,11 +23285,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1955),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1956),
                     },
                 ],
             },
@@ -23327,7 +23334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(1950),
+                    ty: DeclarationId(1957),
                 }],
             },
             type_params: vec![],
@@ -23351,7 +23358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1958),
                     },
                 ],
             },
@@ -23399,11 +23406,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1959),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1960),
                     },
                 ],
             },
@@ -23419,48 +23426,250 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
         });
         declarations.push(Declaration {
             id: DeclarationId(872),
+            name: Some("ShapeATarget".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Rust".to_string(),
+                        ty: DeclarationId(1961),
+                    },
+                    Field {
+                        label: "Python".to_string(),
+                        ty: DeclarationId(1962),
+                    },
+                    Field {
+                        label: "Go".to_string(),
+                        ty: DeclarationId(1963),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5382, 5420),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(873),
+            name: Some("FormAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Atom".to_string(),
+                        ty: DeclarationId(1964),
+                    },
+                    Field {
+                        label: "Conj".to_string(),
+                        ty: DeclarationId(1965),
+                    },
+                    Field {
+                        label: "Disj".to_string(),
+                        ty: DeclarationId(1966),
+                    },
+                    Field {
+                        label: "Arrow".to_string(),
+                        ty: DeclarationId(1967),
+                    },
+                    Field {
+                        label: "Cardinality".to_string(),
+                        ty: DeclarationId(1968),
+                    },
+                    Field {
+                        label: "Instantiation".to_string(),
+                        ty: DeclarationId(1969),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6220, 6292),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(874),
+            name: Some("BehaviorAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Value".to_string(),
+                        ty: DeclarationId(1970),
+                    },
+                    Field {
+                        label: "Transform".to_string(),
+                        ty: DeclarationId(1971),
+                    },
+                    Field {
+                        label: "Branch".to_string(),
+                        ty: DeclarationId(1972),
+                    },
+                    Field {
+                        label: "Loop".to_string(),
+                        ty: DeclarationId(1973),
+                    },
+                    Field {
+                        label: "Bind".to_string(),
+                        ty: DeclarationId(1974),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6852, 6912),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(875),
+            name: Some("MethodTemplateContractKey".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(872),
+                    },
+                    Field {
+                        label: "dag_method".to_string(),
+                        ty: DeclarationId(759),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7296, 7377),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(876),
+            name: Some("EmissionCell".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "connective".to_string(),
+                        ty: DeclarationId(873),
+                    },
+                    Field {
+                        label: "behavior".to_string(),
+                        ty: DeclarationId(874),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7810, 7879),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(877),
+            name: Some("EmissionPathProjection".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "row_identity".to_string(),
+                        ty: DeclarationId(875),
+                    },
+                    Field {
+                        label: "cells".to_string(),
+                        ty: DeclarationId(1975),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8225, 8326),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(878),
+            name: Some("emission_path_projections".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(606),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(607),
+                    value: DeclarationId(877),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1976)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::List(vec![])),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8688, 8753),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(879),
             name: Some("CompilerDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1977),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1978),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1980),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1981),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1982),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(1960),
+                        ty: DeclarationId(1983),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(1961),
+                        ty: DeclarationId(1984),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(1962),
+                        ty: DeclarationId(1985),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(1963),
+                        ty: DeclarationId(1986),
                     },
                 ],
             },
@@ -23475,7 +23684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 990, 1229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(873),
+            id: DeclarationId(880),
             name: Some("Correction".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23504,7 +23713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1435, 1688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(874),
+            id: DeclarationId(881),
             name: Some("DiagnosticKindDecl".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23529,12 +23738,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 2468, 2531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(875),
+            id: DeclarationId(882),
             name: Some("LensInstanceKindWitness".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "kind_decl".to_string(),
-                    ty: DeclarationId(1120),
+                    ty: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
@@ -23548,17 +23757,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 4733, 4793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(876),
+            id: DeclarationId(883),
             name: Some("AnyDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1964),
+                        ty: DeclarationId(1987),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1965),
+                        ty: DeclarationId(1988),
                     },
                 ],
             },
@@ -23573,13 +23782,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5402, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(877),
+            id: DeclarationId(884),
             name: Some("Diagnostic".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(876),
+                        ty: DeclarationId(883),
                     },
                     Field {
                         label: "span".to_string(),
@@ -23591,7 +23800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1966),
+                        ty: DeclarationId(1989),
                     },
                 ],
             },
@@ -23606,37 +23815,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5880, 5988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(878),
+            id: DeclarationId(885),
             name: Some("EmissionDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1967),
+                        ty: DeclarationId(1990),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1968),
+                        ty: DeclarationId(1991),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1970),
+                        ty: DeclarationId(1993),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1971),
+                        ty: DeclarationId(1994),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1972),
+                        ty: DeclarationId(1995),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1973),
+                        ty: DeclarationId(1996),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1997),
                     },
                 ],
             },
@@ -23651,21 +23860,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 8622, 11339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(879),
+            id: DeclarationId(886),
             name: Some("Witness".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1989),
+                        ty: DeclarationId(2012),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(2013),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(880)],
+            type_params: vec![DeclarationId(887)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -23676,7 +23885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(880),
+            id: DeclarationId(887),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -23690,17 +23899,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(881),
+            id: DeclarationId(888),
             name: Some("OptionalDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(2014),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(2015),
                     },
                 ],
             },
@@ -23715,21 +23924,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1851, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(882),
+            id: DeclarationId(889),
             name: Some("DimensionReport".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(2018),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2022),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(883)],
+            type_params: vec![DeclarationId(890)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -23740,7 +23949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(883),
+            id: DeclarationId(890),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -23754,7 +23963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(884),
+            id: DeclarationId(891),
             name: Some("AnalysisDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23764,19 +23973,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2024),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2025),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2026),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(885)],
+            type_params: vec![DeclarationId(892)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -23787,7 +23996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(885),
+            id: DeclarationId(892),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -23801,18 +24010,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(886),
+            id: DeclarationId(893),
             name: Some("Dimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(888),
+                    ty: DeclarationId(895),
                 }],
             },
-            type_params: vec![DeclarationId(887), DeclarationId(888)],
+            type_params: vec![DeclarationId(894), DeclarationId(895)],
             phantom_params: vec![PhantomParameter {
-                parameter: DeclarationId(887),
-                algebra: DeclarationId(2004),
+                parameter: DeclarationId(894),
+                algebra: DeclarationId(2027),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -23823,7 +24032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(887),
+            id: DeclarationId(894),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -23837,7 +24046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(888),
+            id: DeclarationId(895),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -23851,7 +24060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(889),
+            id: DeclarationId(896),
             name: Some("Meters".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23865,7 +24074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4704, 4715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(890),
+            id: DeclarationId(897),
             name: Some("Seconds".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23879,7 +24088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4716, 4728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(891),
+            id: DeclarationId(898),
             name: Some("Kilograms".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23893,7 +24102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4729, 4743),
         });
         declarations.push(Declaration {
-            id: DeclarationId(892),
+            id: DeclarationId(899),
             name: Some("Amperes".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23907,7 +24116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4744, 4756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(893),
+            id: DeclarationId(900),
             name: Some("Kelvin".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23921,7 +24130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4757, 4768),
         });
         declarations.push(Declaration {
-            id: DeclarationId(894),
+            id: DeclarationId(901),
             name: Some("Moles".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23935,7 +24144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4769, 4779),
         });
         declarations.push(Declaration {
-            id: DeclarationId(895),
+            id: DeclarationId(902),
             name: Some("Candela".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23949,18 +24158,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4780, 4792),
         });
         declarations.push(Declaration {
-            id: DeclarationId(896),
+            id: DeclarationId(903),
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1975),
-                    DeclarationId(1976),
-                    DeclarationId(1977),
+                    DeclarationId(1998),
+                    DeclarationId(1999),
+                    DeclarationId(2000),
                 ],
-                output: DeclarationId(1978),
+                output: DeclarationId(2001),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
-            type_params: vec![DeclarationId(897), DeclarationId(898)],
+            type_params: vec![DeclarationId(904), DeclarationId(905)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -23971,7 +24180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(897),
+            id: DeclarationId(904),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -23985,7 +24194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(898),
+            id: DeclarationId(905),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -23999,18 +24208,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(899),
+            id: DeclarationId(906),
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1979),
-                    DeclarationId(1980),
-                    DeclarationId(1981),
+                    DeclarationId(2002),
+                    DeclarationId(2003),
+                    DeclarationId(2004),
                 ],
-                output: DeclarationId(1982),
+                output: DeclarationId(2005),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
-            type_params: vec![DeclarationId(900), DeclarationId(901)],
+            type_params: vec![DeclarationId(907), DeclarationId(908)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -24021,7 +24230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(900),
+            id: DeclarationId(907),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -24035,7 +24244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(901),
+            id: DeclarationId(908),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -24049,14 +24258,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(902),
+            id: DeclarationId(909),
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1983), DeclarationId(1984), DeclarationId(904)],
-                output: DeclarationId(1985),
+                inputs: vec![DeclarationId(2006), DeclarationId(2007), DeclarationId(911)],
+                output: DeclarationId(2008),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
-            type_params: vec![DeclarationId(903), DeclarationId(904)],
+            type_params: vec![DeclarationId(910), DeclarationId(911)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -24067,7 +24276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(903),
+            id: DeclarationId(910),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -24081,7 +24290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(904),
+            id: DeclarationId(911),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -24095,14 +24304,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(905),
+            id: DeclarationId(912),
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1986), DeclarationId(1987), DeclarationId(907)],
-                output: DeclarationId(1988),
+                inputs: vec![DeclarationId(2009), DeclarationId(2010), DeclarationId(914)],
+                output: DeclarationId(2011),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
-            type_params: vec![DeclarationId(906), DeclarationId(907)],
+            type_params: vec![DeclarationId(913), DeclarationId(914)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -24113,7 +24322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(906),
+            id: DeclarationId(913),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -24127,7 +24336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(907),
+            id: DeclarationId(914),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -24141,17 +24350,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(908),
+            id: DeclarationId(915),
             name: Some("TypeRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -24163,7 +24372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2005),
+                        ty: DeclarationId(2028),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24182,29 +24391,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 736, 887),
         });
         declarations.push(Declaration {
-            id: DeclarationId(909),
+            id: DeclarationId(916),
             name: Some("TargetIntegerTypeInhabitance".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "kernel_integer".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(910),
+                        ty: DeclarationId(917),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -24219,17 +24428,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 2521, 2718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(910),
+            id: DeclarationId(917),
             name: Some("TargetIntegerInhabitanceBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2030),
                     },
                 ],
             },
@@ -24244,7 +24453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4149, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(911),
+            id: DeclarationId(918),
             name: Some("FieldBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24254,7 +24463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "access".to_string(),
-                        ty: DeclarationId(912),
+                        ty: DeclarationId(919),
                     },
                     Field {
                         label: "borrowed_read".to_string(),
@@ -24273,17 +24482,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4239, 4323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(912),
+            id: DeclarationId(919),
             name: Some("FieldAccess".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2031),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2032),
                     },
                 ],
             },
@@ -24298,21 +24507,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4706, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(913),
+            id: DeclarationId(920),
             name: Some("OperatorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -24335,17 +24544,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4775, 4906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(914),
+            id: DeclarationId(921),
             name: Some("BehaviorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -24368,25 +24577,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4908, 5018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(915),
+            id: DeclarationId(922),
             name: Some("CallableRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(924),
+                        ty: DeclarationId(931),
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(2010),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24405,7 +24614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5020, 5179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(916),
+            id: DeclarationId(923),
             name: Some("CallableParameter".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24415,7 +24624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "disposition".to_string(),
-                        ty: DeclarationId(917),
+                        ty: DeclarationId(924),
                     },
                 ],
             },
@@ -24430,17 +24639,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5601, 5675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(917),
+            id: DeclarationId(924),
             name: Some("ParameterDisposition".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2011),
+                        ty: DeclarationId(2034),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2035),
                     },
                 ],
             },
@@ -24455,17 +24664,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6132, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(918),
+            id: DeclarationId(925),
             name: Some("StringOwnershipAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(2013),
+                        ty: DeclarationId(2036),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(2014),
+                        ty: DeclarationId(2037),
                     },
                 ],
             },
@@ -24480,17 +24689,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6595, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(919),
+            id: DeclarationId(926),
             name: Some("StringLifetimeAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(2015),
+                        ty: DeclarationId(2038),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2039),
                     },
                 ],
             },
@@ -24505,21 +24714,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6950, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(920),
+            id: DeclarationId(927),
             name: Some("StringGrowabilityAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(2017),
+                        ty: DeclarationId(2040),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2041),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2042),
                     },
                 ],
             },
@@ -24534,12 +24743,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7229, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(921),
+            id: DeclarationId(928),
             name: Some("StringEncodingAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(2020),
+                    ty: DeclarationId(2043),
                 }],
             },
             type_params: vec![],
@@ -24553,37 +24762,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7605, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(922),
+            id: DeclarationId(929),
             name: Some("StringFamilyInhabitanceRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "target_type".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "ownership".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "lifetime".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "growability".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "encoding".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -24598,17 +24807,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8235, 8474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(923),
+            id: DeclarationId(930),
             name: Some("TypeInstantiationRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -24631,49 +24840,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8476, 8595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(924),
+            id: DeclarationId(931),
             name: Some("CallableStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2044),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2045),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2046),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2047),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2048),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(2026),
+                        ty: DeclarationId(2049),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(2027),
+                        ty: DeclarationId(2050),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(2028),
+                        ty: DeclarationId(2051),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(2029),
+                        ty: DeclarationId(2052),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(2030),
+                        ty: DeclarationId(2053),
                     },
                 ],
             },
@@ -24688,29 +24897,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9000, 9169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(925),
+            id: DeclarationId(932),
             name: Some("PatternRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(926),
+                        ty: DeclarationId(933),
                     },
                     Field {
                         label: "empty_variant".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "cons_variant".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "scrutinee".to_string(),
@@ -24749,17 +24958,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11108, 11397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(926),
+            id: DeclarationId(933),
             name: Some("PatternStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(2031),
+                        ty: DeclarationId(2054),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(2032),
+                        ty: DeclarationId(2055),
                     },
                 ],
             },
@@ -24774,7 +24983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11837, 11903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(927),
+            id: DeclarationId(934),
             name: Some("StatementSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24799,7 +25008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11905, 11982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(928),
+            id: DeclarationId(935),
             name: Some("ExpressionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24828,7 +25037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11984, 12074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(929),
+            id: DeclarationId(936),
             name: Some("ForEachSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24853,7 +25062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12076, 12135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(930),
+            id: DeclarationId(937),
             name: Some("ControlFlowSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24867,7 +25076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "for_each_syntax".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(936),
                     },
                 ],
             },
@@ -24882,7 +25091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12137, 12234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(931),
+            id: DeclarationId(938),
             name: Some("LiteralSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24911,7 +25120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12236, 12332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(932),
+            id: DeclarationId(939),
             name: Some("ModuleSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -24930,7 +25139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12334, 12380),
         });
         declarations.push(Declaration {
-            id: DeclarationId(933),
+            id: DeclarationId(940),
             name: Some("FunctionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24967,7 +25176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12382, 12534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(934),
+            id: DeclarationId(941),
             name: Some("TypeApplicationSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -24986,7 +25195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12536, 12585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(935),
+            id: DeclarationId(942),
             name: Some("TypeDefinitionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25023,7 +25232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12799, 12947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(936),
+            id: DeclarationId(943),
             name: Some("RecordDeriveTemplateBundle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25048,7 +25257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 13608, 13701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(937),
+            id: DeclarationId(944),
             name: Some("PatternMatchSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25097,45 +25306,45 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14405, 14645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(938),
+            id: DeclarationId(945),
             name: Some("CollectionOps".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "concat_contract".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "length_contract".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "is_empty_contract".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "fold_contract".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "filter_contract".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "flat_map_contract".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "any_contract".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "all_contract".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "map_contract".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "filter".to_string(),
@@ -25170,7 +25379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14647, 15883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(939),
+            id: DeclarationId(946),
             name: Some("ValueConstructionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25207,17 +25416,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15885, 16071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(940),
+            id: DeclarationId(947),
             name: Some("RenderingModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(941),
+                        ty: DeclarationId(948),
                     },
                     Field {
                         label: "construct".to_string(),
-                        ty: DeclarationId(942),
+                        ty: DeclarationId(949),
                     },
                 ],
             },
@@ -25232,17 +25441,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16073, 16148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(941),
+            id: DeclarationId(948),
             name: Some("ReadStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(2033),
+                        ty: DeclarationId(2056),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2034),
+                        ty: DeclarationId(2057),
                     },
                 ],
             },
@@ -25257,17 +25466,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16646, 16690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(942),
+            id: DeclarationId(949),
             name: Some("ConstructStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(2035),
+                        ty: DeclarationId(2058),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2059),
                     },
                 ],
             },
@@ -25282,57 +25491,57 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16983, 17037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(943),
+            id: DeclarationId(950),
             name: Some("LanguageSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "statements".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "expressions".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "control_flow".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "literals".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "modules".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "functions".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "type_applications".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "type_definitions".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "record_derive_templates".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "patterns".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "collection_ops".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -25347,17 +25556,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17039, 17565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(944),
+            id: DeclarationId(951),
             name: Some("PlaceholderConvention".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2060),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2061),
                     },
                 ],
             },
@@ -25372,17 +25581,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18939, 18994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(945),
+            id: DeclarationId(952),
             name: Some("MethodEmitTemplate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2062),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2063),
                     },
                 ],
             },
@@ -25397,7 +25606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20129, 20285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(946),
+            id: DeclarationId(953),
             name: Some("MethodTemplateContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25411,7 +25620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "emit_template".to_string(),
-                        ty: DeclarationId(945),
+                        ty: DeclarationId(952),
                     },
                     Field {
                         label: "wraps_result".to_string(),
@@ -25419,7 +25628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "placeholder_convention".to_string(),
-                        ty: DeclarationId(944),
+                        ty: DeclarationId(951),
                     },
                 ],
             },
@@ -25434,7 +25643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 22078, 22265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(947),
+            id: DeclarationId(954),
             name: Some("BootstrapFixture".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -25453,29 +25662,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(948),
+            id: DeclarationId(955),
             name: Some("BootstrapFixtureSet".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "rust_pilot_primitives".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(954),
                     },
                     Field {
                         label: "rust_method_template_contracts".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(954),
                     },
                     Field {
                         label: "python_method_template_contracts".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(954),
                     },
                     Field {
                         label: "go_method_template_contracts".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(954),
                     },
                     Field {
                         label: "anthropic_operations".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(954),
+                    },
+                    Field {
+                        label: "cross_target_coverage".to_string(),
+                        ty: DeclarationId(954),
                     },
                 ],
             },
@@ -25487,18 +25700,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 1864),
+            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 1906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(949),
+            id: DeclarationId(956),
             name: Some("bootstrap_fixture_authority".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(948),
+                template: DeclarationId(955),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(948)),
+            meta_tag: Some(DeclarationId(955)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25548,22 +25761,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             )),
                         )]),
                     ),
+                    (
+                        "cross_target_coverage".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/cross_target_coverage.dag".to_string(),
+                            )),
+                        )]),
+                    ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1866, 2426),
+            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1908, 2557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(950),
+            id: DeclarationId(957),
             name: Some("go_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25584,7 +25806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -25597,7 +25819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -25608,15 +25830,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(951),
+            id: DeclarationId(958),
             name: Some("go_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25635,7 +25857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -25648,7 +25870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -25659,15 +25881,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(952),
+            id: DeclarationId(959),
             name: Some("go_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25686,7 +25908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -25699,7 +25921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -25710,15 +25932,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(953),
+            id: DeclarationId(960),
             name: Some("go_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25739,7 +25961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -25752,7 +25974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -25763,15 +25985,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(954),
+            id: DeclarationId(961),
             name: Some("go_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25792,7 +26014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -25805,7 +26027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -25816,15 +26038,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(955),
+            id: DeclarationId(962),
             name: Some("go_filter_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25845,7 +26067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -25858,7 +26080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -25869,15 +26091,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(956),
+            id: DeclarationId(963),
             name: Some("go_any_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25898,7 +26120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -25911,7 +26133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -25922,15 +26144,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(957),
+            id: DeclarationId(964),
             name: Some("go_all_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25951,7 +26173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -25964,7 +26186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -25975,15 +26197,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(958),
+            id: DeclarationId(965),
             name: Some("go_flat_map_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -26004,7 +26226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -26017,7 +26239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -26028,18 +26250,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(959),
+            id: DeclarationId(966),
             name: Some("go_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(946),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2041)),
+            meta_tag: Some(DeclarationId(2064)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -26058,7 +26280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -26071,7 +26293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -26093,7 +26315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -26106,7 +26328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -26128,7 +26350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -26141,15 +26363,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
                 ]),
-                FieldValue::Reference(DeclarationId(955)),
-                FieldValue::Reference(DeclarationId(956)),
-                FieldValue::Reference(DeclarationId(957)),
-                FieldValue::Reference(DeclarationId(958)),
+                FieldValue::Reference(DeclarationId(962)),
+                FieldValue::Reference(DeclarationId(963)),
+                FieldValue::Reference(DeclarationId(964)),
+                FieldValue::Reference(DeclarationId(965)),
                 FieldValue::Record(vec![
                     (
                         "dag_method".to_string(),
@@ -26165,7 +26387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -26178,7 +26400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -26198,7 +26420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -26211,7 +26433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -26233,7 +26455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -26246,7 +26468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -26268,7 +26490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -26281,7 +26503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -26303,7 +26525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -26316,7 +26538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -26327,29 +26549,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(960),
+            id: DeclarationId(967),
             name: Some("RecursionShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2074),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2052),
+                        ty: DeclarationId(2075),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2076),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2054),
+                        ty: DeclarationId(2077),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2055),
+                        ty: DeclarationId(2078),
                     },
                 ],
             },
@@ -26364,7 +26586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5538, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(961),
+            id: DeclarationId(968),
             name: Some("InductiveField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26382,7 +26604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "shape".to_string(),
-                        ty: DeclarationId(960),
+                        ty: DeclarationId(967),
                     },
                     Field {
                         label: "element_type".to_string(),
@@ -26401,10 +26623,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 7103, 7525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(962),
+            id: DeclarationId(969),
             name: Some("recursion_shape_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(960), DeclarationId(960)],
+                inputs: vec![DeclarationId(967), DeclarationId(967)],
                 output: DeclarationId(100),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7595, 7967)),
             },
@@ -26419,10 +26641,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 7527, 7967),
         });
         declarations.push(Declaration {
-            id: DeclarationId(963),
+            id: DeclarationId(970),
             name: Some("inductive_field_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(961), DeclarationId(961)],
+                inputs: vec![DeclarationId(968), DeclarationId(968)],
                 output: DeclarationId(100),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8037, 8235)),
             },
@@ -26437,11 +26659,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 7969, 8235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(964),
+            id: DeclarationId(971),
             name: Some("inductive_field_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(961), DeclarationId(197)],
-                output: DeclarationId(1074),
+                inputs: vec![DeclarationId(968), DeclarationId(197)],
+                output: DeclarationId(1081),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8701, 8732)),
             },
             type_params: vec![],
@@ -26455,29 +26677,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 8611, 8732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(965),
+            id: DeclarationId(972),
             name: Some("SubValueRelation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2056),
+                        ty: DeclarationId(2079),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2057),
+                        ty: DeclarationId(2080),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2081),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2059),
+                        ty: DeclarationId(2082),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2060),
+                        ty: DeclarationId(2083),
                     },
                 ],
             },
@@ -26492,11 +26714,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9878, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(966),
+            id: DeclarationId(973),
             name: Some("sub_value_to_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965)],
-                output: DeclarationId(1067),
+                inputs: vec![DeclarationId(972)],
+                output: DeclarationId(1074),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     11067,
@@ -26514,7 +26736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10995, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(967),
+            id: DeclarationId(974),
             name: Some("shrink_factor_eq".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(848), DeclarationId(848)],
@@ -26536,11 +26758,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 12076, 12638),
         });
         declarations.push(Declaration {
-            id: DeclarationId(968),
+            id: DeclarationId(975),
             name: Some("meet_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965), DeclarationId(965)],
-                output: DeclarationId(965),
+                inputs: vec![DeclarationId(972), DeclarationId(972)],
+                output: DeclarationId(972),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     13229,
@@ -26558,11 +26780,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 13149, 14641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(969),
+            id: DeclarationId(976),
             name: Some("join_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965), DeclarationId(965)],
-                output: DeclarationId(965),
+                inputs: vec![DeclarationId(972), DeclarationId(972)],
+                output: DeclarationId(972),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     14973,
@@ -26580,11 +26802,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 14893, 16276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(970),
+            id: DeclarationId(977),
             name: Some("compose_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965), DeclarationId(961)],
-                output: DeclarationId(965),
+                inputs: vec![DeclarationId(972), DeclarationId(968)],
+                output: DeclarationId(972),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     17419,
@@ -26602,11 +26824,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 17331, 17541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(971),
+            id: DeclarationId(978),
             name: Some("compose_sub_value_relations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965), DeclarationId(965)],
-                output: DeclarationId(965),
+                inputs: vec![DeclarationId(972), DeclarationId(972)],
+                output: DeclarationId(972),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     18397,
@@ -26624,11 +26846,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 18289, 19743),
         });
         declarations.push(Declaration {
-            id: DeclarationId(972),
+            id: DeclarationId(979),
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965)],
-                output: DeclarationId(2042),
+                inputs: vec![DeclarationId(972)],
+                output: DeclarationId(2065),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20518,
@@ -26646,11 +26868,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20445, 21314),
         });
         declarations.push(Declaration {
-            id: DeclarationId(973),
+            id: DeclarationId(980),
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965)],
-                output: DeclarationId(2043),
+                inputs: vec![DeclarationId(972)],
+                output: DeclarationId(2066),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21906,
@@ -26668,25 +26890,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21827, 22811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(974),
+            id: DeclarationId(981),
             name: Some("PolynomialExponent".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2061),
+                        ty: DeclarationId(2084),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2062),
+                        ty: DeclarationId(2085),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2063),
+                        ty: DeclarationId(2086),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2064),
+                        ty: DeclarationId(2087),
                     },
                 ],
             },
@@ -26701,11 +26923,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24054, 24309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(975),
+            id: DeclarationId(982),
             name: Some("poly_exp_degree_one".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(974),
+                output: DeclarationId(981),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     24358,
@@ -26723,17 +26945,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24311, 24397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(976),
+            id: DeclarationId(983),
             name: Some("AtomicCost".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2065),
+                        ty: DeclarationId(2088),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2066),
+                        ty: DeclarationId(2089),
                     },
                 ],
             },
@@ -26748,37 +26970,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24909, 25026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(977),
+            id: DeclarationId(984),
             name: Some("CostBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2067),
+                        ty: DeclarationId(2090),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2068),
+                        ty: DeclarationId(2091),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2070),
+                        ty: DeclarationId(2093),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2073),
+                        ty: DeclarationId(2096),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2075),
+                        ty: DeclarationId(2098),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2076),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2077),
+                        ty: DeclarationId(2100),
                     },
                 ],
             },
@@ -26793,11 +27015,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26656, 27416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(978),
+            id: DeclarationId(985),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2044)],
-                output: DeclarationId(977),
+                inputs: vec![DeclarationId(2067)],
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     27827,
@@ -26815,10 +27037,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27777, 27933),
         });
         declarations.push(Declaration {
-            id: DeclarationId(979),
+            id: DeclarationId(986),
             name: Some("cost_bound_is_sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(977)],
+                inputs: vec![DeclarationId(984)],
                 output: DeclarationId(100),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -26837,11 +27059,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 28208, 28510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(980),
+            id: DeclarationId(987),
             name: Some("cost_constant".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28544,
@@ -26859,11 +27081,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 28512, 28561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(981),
+            id: DeclarationId(988),
             name: Some("cost_linear".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28605,
@@ -26881,11 +27103,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 28562, 28689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(982),
+            id: DeclarationId(989),
             name: Some("cost_poly".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28744,
@@ -26903,11 +27125,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 28690, 29143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(983),
+            id: DeclarationId(990),
             name: Some("cost_root".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29193,
@@ -26925,11 +27147,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29144, 29467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(984),
+            id: DeclarationId(991),
             name: Some("cost_sqrt".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29509,
@@ -26947,11 +27169,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29468, 29542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(985),
+            id: DeclarationId(992),
             name: Some("cost_cbrt".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29584,
@@ -26969,11 +27191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29543, 29617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(986),
+            id: DeclarationId(993),
             name: Some("cost_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29658,
@@ -26991,11 +27213,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29618, 29708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(987),
+            id: DeclarationId(994),
             name: Some("cost_nlogn".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29752,
@@ -27013,11 +27235,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29710, 29870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(988),
+            id: DeclarationId(995),
             name: Some("cost_graph_linear".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29940,
@@ -27035,7 +27257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 29872, 30116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(989),
+            id: DeclarationId(996),
             name: Some("RecurrenceForm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27068,11 +27290,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31273, 31364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(990),
+            id: DeclarationId(997),
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2045),
+                output: DeclarationId(2068),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31955,
@@ -27090,11 +27312,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31912, 32206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(991),
+            id: DeclarationId(998),
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2046),
+                output: DeclarationId(2069),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     32251,
@@ -27112,11 +27334,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 32208, 33040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(992),
+            id: DeclarationId(999),
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2047),
+                output: DeclarationId(2070),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33500,
@@ -27134,11 +27356,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33456, 33623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(993),
+            id: DeclarationId(1000),
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2048),
+                output: DeclarationId(2071),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33975,
@@ -27156,11 +27378,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33927, 35020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(994),
+            id: DeclarationId(1001),
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2049),
+                output: DeclarationId(2072),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35238,
@@ -27178,7 +27400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35192, 35353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(995),
+            id: DeclarationId(1002),
             name: Some("ceil_log_iter".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -27187,7 +27409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(81),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(2050),
+                output: DeclarationId(2073),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35510,
@@ -27205,11 +27427,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35439, 35872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(996),
+            id: DeclarationId(1003),
             name: Some("master_theorem".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(989)],
-                output: DeclarationId(977),
+                inputs: vec![DeclarationId(996)],
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35927,
@@ -27227,11 +27449,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35874, 37964),
         });
         declarations.push(Declaration {
-            id: DeclarationId(997),
+            id: DeclarationId(1004),
             name: Some("catamorphism_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     38317,
@@ -27249,7 +27471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 38247, 38475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(998),
+            id: DeclarationId(1005),
             name: Some("derive_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -27258,7 +27480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     DeclarationId(848),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     38974,
@@ -27276,11 +27498,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 38873, 39998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(999),
+            id: DeclarationId(1006),
             name: Some("tree_traversal_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40331,
@@ -27298,11 +27520,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 40292, 40388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1000),
+            id: DeclarationId(1007),
             name: Some("nested_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40431,
@@ -27320,11 +27542,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 40390, 40489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1001),
+            id: DeclarationId(1008),
             name: Some("linear_scan_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40589,
@@ -27342,11 +27564,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 40553, 40644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1002),
+            id: DeclarationId(1009),
             name: Some("binary_search_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40841,
@@ -27364,11 +27586,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 40803, 40956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1003),
+            id: DeclarationId(1010),
             name: Some("mergesort_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41036,
@@ -27386,11 +27608,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41002, 41151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1004),
+            id: DeclarationId(1011),
             name: Some("karatsuba_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41318,
@@ -27408,11 +27630,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41284, 41437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1005),
+            id: DeclarationId(1012),
             name: Some("strassen_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41602,
@@ -27430,11 +27652,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41569, 41716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1006),
+            id: DeclarationId(1013),
             name: Some("trial_division_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41833,
@@ -27452,11 +27674,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41794, 41858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1007),
+            id: DeclarationId(1014),
             name: Some("cube_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41893,
@@ -27474,11 +27696,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41859, 41918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1008),
+            id: DeclarationId(1015),
             name: Some("kth_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42000,
@@ -27496,11 +27718,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 41961, 42031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1009),
+            id: DeclarationId(1016),
             name: Some("bfs_dfs_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42267,
@@ -27518,11 +27740,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42235, 42318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1010),
+            id: DeclarationId(1017),
             name: Some("dijkstra_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42409,
@@ -27540,11 +27762,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42376, 42691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1011),
+            id: DeclarationId(1018),
             name: Some("bellman_ford_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42794,
@@ -27562,11 +27784,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 42757, 42954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1012),
+            id: DeclarationId(1019),
             name: Some("floyd_warshall_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43061,
@@ -27584,18 +27806,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 43022, 43099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1013),
+            id: DeclarationId(1020),
             name: Some("signed_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1120),
+                    value: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2078)),
+            meta_tag: Some(DeclarationId(2101)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27610,18 +27832,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(1014),
+            id: DeclarationId(1021),
             name: Some("unsigned_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1120),
+                    value: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2079)),
+            meta_tag: Some(DeclarationId(2102)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27636,7 +27858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1015),
+            id: DeclarationId(1022),
             name: Some("Lens".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27646,27 +27868,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2081),
+                        ty: DeclarationId(2104),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2082),
+                        ty: DeclarationId(2105),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2083),
+                        ty: DeclarationId(2106),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2084),
+                        ty: DeclarationId(2107),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2085),
+                        ty: DeclarationId(2108),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1016)],
+            type_params: vec![DeclarationId(1023)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -27677,7 +27899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1016),
+            id: DeclarationId(1023),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())),
             type_params: vec![],
@@ -27691,21 +27913,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1017),
+            id: DeclarationId(1024),
             name: Some("Lookup".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2088),
+                        ty: DeclarationId(2111),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2089),
+                        ty: DeclarationId(2112),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1018)],
+            type_params: vec![DeclarationId(1025)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -27716,7 +27938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4509, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1018),
+            id: DeclarationId(1025),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
@@ -27730,11 +27952,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4509, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1019),
+            id: DeclarationId(1026),
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2086),
+                output: DeclarationId(2109),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)),
             },
             type_params: vec![],
@@ -27748,11 +27970,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1020),
+            id: DeclarationId(1027),
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2087),
+                output: DeclarationId(2110),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)),
             },
             type_params: vec![],
@@ -27766,7 +27988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4601, 4654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1021),
+            id: DeclarationId(1028),
             name: Some("DagDifference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -27785,12 +28007,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 684, 723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1022),
+            id: DeclarationId(1029),
             name: Some("SurfaceModule".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "items".to_string(),
-                    ty: DeclarationId(2090),
+                    ty: DeclarationId(2113),
                 }],
             },
             type_params: vec![],
@@ -27804,7 +28026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1149, 1198),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1023),
+            id: DeclarationId(1030),
             name: Some("SurfaceParam".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27814,11 +28036,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(1027),
+                        ty: DeclarationId(1034),
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2091),
+                        ty: DeclarationId(2114),
                     },
                 ],
             },
@@ -27833,7 +28055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1200, 1281),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1024),
+            id: DeclarationId(1031),
             name: Some("SurfaceField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27843,7 +28065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(1027),
+                        ty: DeclarationId(1034),
                     },
                 ],
             },
@@ -27858,7 +28080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1283, 1337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1025),
+            id: DeclarationId(1032),
             name: Some("SurfaceVariant".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27868,7 +28090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1026),
+                        ty: DeclarationId(1033),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27887,17 +28109,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1339, 1422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1026),
+            id: DeclarationId(1033),
             name: Some("VariantPayload".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Positional".to_string(),
-                        ty: DeclarationId(2093),
+                        ty: DeclarationId(2116),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2118),
                     },
                 ],
             },
@@ -27912,25 +28134,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1712, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1027),
+            id: DeclarationId(1034),
             name: Some("SurfaceType".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Named".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "Parameterized".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "Optional".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2124),
                     },
                 ],
             },
@@ -27945,7 +28167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2052, 2379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1028),
+            id: DeclarationId(1035),
             name: Some("SurfaceRecordField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27955,7 +28177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                     Field {
                         label: "span".to_string(),
@@ -27974,7 +28196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2381, 2463),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1029),
+            id: DeclarationId(1036),
             name: Some("SurfaceMapEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27988,7 +28210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                     Field {
                         label: "span".to_string(),
@@ -28007,17 +28229,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3353, 3454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1030),
+            id: DeclarationId(1037),
             name: Some("SurfaceMatchArm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "pattern".to_string(),
-                        ty: DeclarationId(1032),
+                        ty: DeclarationId(1039),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                     Field {
                         label: "span".to_string(),
@@ -28036,7 +28258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3456, 3545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1031),
+            id: DeclarationId(1038),
             name: Some("SurfacePatternField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28065,21 +28287,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3547, 3627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1032),
+            id: DeclarationId(1039),
             name: Some("SurfacePattern".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BareVariant".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2125),
                     },
                     Field {
                         label: "VariantWith".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2126),
                     },
                     Field {
                         label: "VariantFields".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2128),
                     },
                 ],
             },
@@ -28094,21 +28316,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3725, 3991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1033),
+            id: DeclarationId(1040),
             name: Some("SurfaceLiteral".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Int".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2129),
                     },
                     Field {
                         label: "Bool".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "String".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2131),
                     },
                 ],
             },
@@ -28123,61 +28345,61 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4554, 4620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1034),
+            id: DeclarationId(1041),
             name: Some("SurfaceExpr".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "Var".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "Path".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2136),
                     },
                     Field {
                         label: "Call".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2138),
                     },
                     Field {
                         label: "PathCall".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2142),
                     },
                     Field {
                         label: "VariantRecord".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "Lambda".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "If".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "Match".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2155),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2157),
                     },
                 ],
             },
@@ -28192,49 +28414,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4713, 8532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1035),
+            id: DeclarationId(1042),
             name: Some("SurfaceItem".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Let".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "Fn".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "FnExternalBody".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "Data".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "Module".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "Import".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "TypeAtom".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "TypeRecord".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "TypeSum".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "TypeAlias".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2184),
                     },
                 ],
             },
@@ -28249,15 +28471,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9401, 10719),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1036),
+            id: DeclarationId(1043),
             name: Some("python_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28276,7 +28498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -28289,7 +28511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28304,15 +28526,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1037),
+            id: DeclarationId(1044),
             name: Some("python_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28331,7 +28553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -28344,7 +28566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28359,15 +28581,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1038),
+            id: DeclarationId(1045),
             name: Some("python_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28386,7 +28608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -28399,7 +28621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28414,15 +28636,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1039),
+            id: DeclarationId(1046),
             name: Some("python_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28443,7 +28665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -28456,7 +28678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28471,15 +28693,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1040),
+            id: DeclarationId(1047),
             name: Some("python_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28500,7 +28722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -28513,7 +28735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28528,15 +28750,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1041),
+            id: DeclarationId(1048),
             name: Some("python_filter_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28557,7 +28779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -28570,7 +28792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28585,15 +28807,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1042),
+            id: DeclarationId(1049),
             name: Some("python_any_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28614,7 +28836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28627,7 +28849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28642,15 +28864,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1043),
+            id: DeclarationId(1050),
             name: Some("python_all_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28671,7 +28893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28684,7 +28906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28699,15 +28921,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1044),
+            id: DeclarationId(1051),
             name: Some("python_flat_map_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28728,7 +28950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -28741,7 +28963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28756,18 +28978,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1045),
+            id: DeclarationId(1052),
             name: Some("python_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(946),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2162)),
+            meta_tag: Some(DeclarationId(2185)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -28786,7 +29008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -28799,7 +29021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28819,7 +29041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -28832,7 +29054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28852,7 +29074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -28865,7 +29087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28887,7 +29109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -28900,7 +29122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28922,7 +29144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -28935,7 +29157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28957,7 +29179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -28970,7 +29192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -28992,7 +29214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -29005,15 +29227,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
                 ]),
-                FieldValue::Reference(DeclarationId(1041)),
-                FieldValue::Reference(DeclarationId(1042)),
-                FieldValue::Reference(DeclarationId(1043)),
-                FieldValue::Reference(DeclarationId(1044)),
+                FieldValue::Reference(DeclarationId(1048)),
+                FieldValue::Reference(DeclarationId(1049)),
+                FieldValue::Reference(DeclarationId(1050)),
+                FieldValue::Reference(DeclarationId(1051)),
                 FieldValue::Record(vec![
                     (
                         "dag_method".to_string(),
@@ -29029,7 +29251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -29042,7 +29264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -29062,7 +29284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -29075,7 +29297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -29097,7 +29319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -29110,7 +29332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -29130,7 +29352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -29143,7 +29365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -29163,7 +29385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -29176,7 +29398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -29191,7 +29413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1046),
+            id: DeclarationId(1053),
             name: Some("ResourceHandle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -29224,12 +29446,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/resources.dag", 739, 827),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1047),
+            id: DeclarationId(1054),
             name: Some("ResourceReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "target".to_string(),
-                    ty: DeclarationId(1120),
+                    ty: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
@@ -29243,7 +29465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/resources.dag", 829, 880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1048),
+            id: DeclarationId(1055),
             name: Some("NamedField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -29253,7 +29475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1049),
+                        ty: DeclarationId(1056),
                     },
                 ],
             },
@@ -29268,29 +29490,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 755, 805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1049),
+            id: DeclarationId(1056),
             name: Some("Value".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2191),
                     },
                 ],
             },
@@ -29305,15 +29527,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2117, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1050),
+            id: DeclarationId(1057),
             name: Some("ProgramObservation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observed".to_string(),
-                    ty: DeclarationId(1051),
+                    ty: DeclarationId(1058),
                 }],
             },
-            type_params: vec![DeclarationId(1051)],
+            type_params: vec![DeclarationId(1058)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -29324,7 +29546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3203, 3259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1051),
+            id: DeclarationId(1058),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -29338,12 +29560,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3203, 3259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1052),
+            id: DeclarationId(1059),
             name: Some("EvalFrame".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2169),
+                    ty: DeclarationId(2192),
                 }],
             },
             type_params: vec![],
@@ -29357,12 +29579,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3902, 3951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1053),
+            id: DeclarationId(1060),
             name: Some("EvalStateStack".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2170),
+                    ty: DeclarationId(2193),
                 }],
             },
             type_params: vec![],
@@ -29376,12 +29598,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4505, 4554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1054),
+            id: DeclarationId(1061),
             name: Some("EvalStateKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "state".to_string(),
-                    ty: DeclarationId(1053),
+                    ty: DeclarationId(1060),
                 }],
             },
             type_params: vec![],
@@ -29395,12 +29617,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4935, 4980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1055),
+            id: DeclarationId(1062),
             name: Some("EvalStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2171),
+                    ty: DeclarationId(2194),
                 }],
             },
             type_params: vec![],
@@ -29414,12 +29636,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5385, 5459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1056),
+            id: DeclarationId(1063),
             name: Some("InputEvaluationOrder".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LeftFirst".to_string(),
-                    ty: DeclarationId(2172),
+                    ty: DeclarationId(2195),
                 }],
             },
             type_params: vec![],
@@ -29433,7 +29655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5696, 5733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1057),
+            id: DeclarationId(1064),
             name: Some("EvalMemoKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -29447,11 +29669,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "state_key".to_string(),
-                        ty: DeclarationId(1054),
+                        ty: DeclarationId(1061),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(1055),
+                        ty: DeclarationId(1062),
                     },
                 ],
             },
@@ -29465,13 +29687,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153),
         });
-        declarations.push(Declaration { id: DeclarationId(1058), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(946), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(946)), 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(230)))])), ("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(2040), 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(2038), 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(1059), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(946), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(946)), 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(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2040), 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(2038), 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(1060), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(946), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(946)), 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(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2040), 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(2038), 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(1061), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(946), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(946)), 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(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2040), 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(2038), 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(1062), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(606), arguments: vec![TemplateArgument { parameter: DeclarationId(607), value: DeclarationId(946) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2173)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2039), 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(2038), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2039), 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(2038), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2039), 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(2038), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2039), 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(2038), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2039), 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(2038), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2039), 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(2038), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2039), 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(2038), payload: vec![] })]), FieldValue::Reference(DeclarationId(1058)), FieldValue::Reference(DeclarationId(1059)), FieldValue::Reference(DeclarationId(1060)), FieldValue::Reference(DeclarationId(1061)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2039), 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(2038), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2039), 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(2038), 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(1065), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(953), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(953)), 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(230)))])), ("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(2063), 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(2061), 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(1066), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(953), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(953)), 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(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2063), 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(2061), 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(1067), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(953), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(953)), 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(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2063), 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(2061), 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(1068), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(953), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(953)), 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(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2063), 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(2061), 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(1069), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(606), arguments: vec![TemplateArgument { parameter: DeclarationId(607), value: DeclarationId(953) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2196)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2062), 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(2061), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2062), 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(2061), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2062), 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(2061), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2062), 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(2061), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2062), 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(2061), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2062), 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(2061), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2062), 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(2061), payload: vec![] })]), FieldValue::Reference(DeclarationId(1065)), FieldValue::Reference(DeclarationId(1066)), FieldValue::Reference(DeclarationId(1067)), FieldValue::Reference(DeclarationId(1068)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2062), 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(2061), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2062), 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(2061), 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(1063),
+            id: DeclarationId(1070),
             name: Some("InputField".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -29485,7 +29707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1064),
+            id: DeclarationId(1071),
             name: Some("RestEndpointBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -29510,12 +29732,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 4653, 4725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1065),
+            id: DeclarationId(1072),
             name: Some("CallableRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1120),
+                    ty: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
@@ -29529,21 +29751,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 5533, 5576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1066),
+            id: DeclarationId(1073),
             name: Some("Operation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "callable".to_string(),
-                        ty: DeclarationId(1065),
+                        ty: DeclarationId(1072),
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "endpoint".to_string(),
-                        ty: DeclarationId(1064),
+                        ty: DeclarationId(1071),
                     },
                 ],
             },
@@ -29558,21 +29780,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6785, 6895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1067),
+            id: DeclarationId(1074),
             name: Some("DescentEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2207),
                     },
                 ],
             },
@@ -29587,10 +29809,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 642, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1068),
+            id: DeclarationId(1075),
             name: Some("evidence_rank".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1067)],
+                inputs: vec![DeclarationId(1074)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 756, 838)),
             },
@@ -29605,11 +29827,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 712, 838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1069),
+            id: DeclarationId(1076),
             name: Some("merge_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1067), DeclarationId(1067)],
-                output: DeclarationId(1067),
+                inputs: vec![DeclarationId(1074), DeclarationId(1074)],
+                output: DeclarationId(1074),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 982, 1310)),
             },
             type_params: vec![],
@@ -29623,11 +29845,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 905, 1310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1070),
+            id: DeclarationId(1077),
             name: Some("join_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1067), DeclarationId(1067)],
-                output: DeclarationId(1067),
+                inputs: vec![DeclarationId(1074), DeclarationId(1074)],
+                output: DeclarationId(1074),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     1456,
@@ -29645,11 +29867,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 1380, 1655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1071),
+            id: DeclarationId(1078),
             name: Some("promote_to_strict".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1067)],
-                output: DeclarationId(1067),
+                inputs: vec![DeclarationId(1074)],
+                output: DeclarationId(1074),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2117,
@@ -29667,11 +29889,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2050, 2236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1072),
+            id: DeclarationId(1079),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2175), DeclarationId(2176)],
-                output: DeclarationId(2177),
+                inputs: vec![DeclarationId(2198), DeclarationId(2199)],
+                output: DeclarationId(2200),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2388,
@@ -29689,11 +29911,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2300, 2564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1073),
+            id: DeclarationId(1080),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2178), DeclarationId(197), DeclarationId(1067)],
-                output: DeclarationId(2179),
+                inputs: vec![DeclarationId(2201), DeclarationId(197), DeclarationId(1074)],
+                output: DeclarationId(2202),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2733,
@@ -29711,29 +29933,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2601, 2907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1074),
+            id: DeclarationId(1081),
             name: Some("RankingDimension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2212),
                     },
                 ],
             },
@@ -29748,17 +29970,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3206, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1075),
+            id: DeclarationId(1082),
             name: Some("PositiveDescentAmount".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2214),
                     },
                 ],
             },
@@ -29773,17 +29995,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4378, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1076),
+            id: DeclarationId(1083),
             name: Some("ProportionalDivisor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2216),
                     },
                 ],
             },
@@ -29798,10 +30020,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4937, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1077),
+            id: DeclarationId(1084),
             name: Some("proportional_divisor_to_int".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1076)],
+                inputs: vec![DeclarationId(1083)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
@@ -29820,7 +30042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5029, 5204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1078),
+            id: DeclarationId(1085),
             name: Some("peano_literal_materialization_cap".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -29842,11 +30064,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5388, 5441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1079),
+            id: DeclarationId(1086),
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2180),
+                output: DeclarationId(2203),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     5902,
@@ -29864,11 +30086,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5823, 6262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1080),
+            id: DeclarationId(1087),
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2181),
+                output: DeclarationId(2204),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6342,
@@ -29886,37 +30108,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6264, 6703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1081),
+            id: DeclarationId(1088),
             name: Some("DescentSource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2223),
                     },
                 ],
             },
@@ -29931,12 +30153,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7108, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1082),
+            id: DeclarationId(1089),
             name: Some("TerminationProof".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2201),
+                    ty: DeclarationId(2224),
                 }],
             },
             type_params: vec![],
@@ -29950,7 +30172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7431, 7493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1083),
+            id: DeclarationId(1090),
             name: Some("ProofEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -29964,7 +30186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2202),
+                        ty: DeclarationId(2225),
                     },
                 ],
             },
@@ -29979,189 +30201,189 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7638, 7724),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1084),
+            id: DeclarationId(1091),
             name: Some("TokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2203),
+                        ty: DeclarationId(2226),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2204),
+                        ty: DeclarationId(2227),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2229),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2233),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2237),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2239),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2241),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2242),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2244),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2246),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2247),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2248),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2249),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2251),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2252),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2253),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2254),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2255),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2257),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2261),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2263),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2264),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2266),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2267),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2270),
                     },
                 ],
             },
@@ -30176,13 +30398,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1085),
+            id: DeclarationId(1092),
             name: Some("Token".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1084),
+                        ty: DeclarationId(1091),
                     },
                     Field {
                         label: "span".to_string(),
@@ -30201,61 +30423,61 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1272, 1323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1086),
+            id: DeclarationId(1093),
             name: Some("KeywordTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2271),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2272),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2250),
+                        ty: DeclarationId(2273),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2251),
+                        ty: DeclarationId(2274),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2275),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2276),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2277),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2255),
+                        ty: DeclarationId(2278),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2279),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2280),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2281),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2282),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2283),
                     },
                 ],
             },
@@ -30270,121 +30492,121 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1682, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1087),
+            id: DeclarationId(1094),
             name: Some("PunctTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2284),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2287),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2289),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2290),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2291),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2292),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2293),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2294),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2272),
+                        ty: DeclarationId(2295),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2273),
+                        ty: DeclarationId(2296),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2274),
+                        ty: DeclarationId(2297),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2275),
+                        ty: DeclarationId(2298),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2276),
+                        ty: DeclarationId(2299),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2277),
+                        ty: DeclarationId(2300),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2278),
+                        ty: DeclarationId(2301),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2279),
+                        ty: DeclarationId(2302),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2280),
+                        ty: DeclarationId(2303),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2281),
+                        ty: DeclarationId(2304),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2282),
+                        ty: DeclarationId(2305),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2283),
+                        ty: DeclarationId(2306),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2284),
+                        ty: DeclarationId(2307),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2285),
+                        ty: DeclarationId(2308),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2286),
+                        ty: DeclarationId(2309),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2287),
+                        ty: DeclarationId(2310),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2288),
+                        ty: DeclarationId(2311),
                     },
                 ],
             },
@@ -30399,7 +30621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2264, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1088),
+            id: DeclarationId(1095),
             name: Some("LocalPunctSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -30409,7 +30631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1087),
+                        ty: DeclarationId(1094),
                     },
                 ],
             },
@@ -30424,7 +30646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2780, 2844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1089),
+            id: DeclarationId(1096),
             name: Some("StringEscapeSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -30449,7 +30671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 3231, 3297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1090),
+            id: DeclarationId(1097),
             name: Some("Path".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(131),
@@ -30466,7 +30688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1091),
+            id: DeclarationId(1098),
             name: Some("SnapshotRef".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(123),
@@ -30483,7 +30705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1361, 1391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1092),
+            id: DeclarationId(1099),
             name: Some("CensusListConstant".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30497,15 +30719,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1528, 1554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1093),
+            id: DeclarationId(1100),
             name: Some("expected_hand_authored_non_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1092),
+                template: DeclarationId(1099),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1092)),
+            meta_tag: Some(DeclarationId(1099)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -30514,15 +30736,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1556, 1617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1094),
+            id: DeclarationId(1101),
             name: Some("expected_hand_authored_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1092),
+                template: DeclarationId(1099),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1092)),
+            meta_tag: Some(DeclarationId(1099)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -30531,7 +30753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1618, 1675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1095),
+            id: DeclarationId(1102),
             name: Some("LensProducerFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30545,15 +30767,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1807, 1847),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1096),
+            id: DeclarationId(1103),
             name: Some("lens_producer_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1095),
+                template: DeclarationId(1102),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1095)),
+            meta_tag: Some(DeclarationId(1102)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -30562,7 +30784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 1849, 1929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1097),
+            id: DeclarationId(1104),
             name: Some("CompilerStdPositiveSetRatchet".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30576,15 +30798,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2008, 2045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1098),
+            id: DeclarationId(1105),
             name: Some("compiler_std_positive_set_ratchet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1097),
+                template: DeclarationId(1104),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1097)),
+            meta_tag: Some(DeclarationId(1104)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -30593,49 +30815,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2047, 2121),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1099),
+            id: DeclarationId(1106),
             name: Some("DiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2292),
+                        ty: DeclarationId(2315),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2293),
+                        ty: DeclarationId(2316),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2294),
+                        ty: DeclarationId(2317),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2295),
+                        ty: DeclarationId(2318),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2296),
+                        ty: DeclarationId(2319),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2297),
+                        ty: DeclarationId(2320),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2298),
+                        ty: DeclarationId(2321),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2299),
+                        ty: DeclarationId(2322),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2300),
+                        ty: DeclarationId(2323),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2301),
+                        ty: DeclarationId(2324),
                     },
                 ],
             },
@@ -30650,17 +30872,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1100),
+            id: DeclarationId(1107),
             name: Some("DiagnosticDetailExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2302),
+                        ty: DeclarationId(2325),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2303),
+                        ty: DeclarationId(2326),
                     },
                 ],
             },
@@ -30675,17 +30897,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3056, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1101),
+            id: DeclarationId(1108),
             name: Some("DiagnosticReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1099),
+                        ty: DeclarationId(1106),
                     },
                     Field {
                         label: "detail_contains".to_string(),
-                        ty: DeclarationId(1100),
+                        ty: DeclarationId(1107),
                     },
                 ],
             },
@@ -30700,17 +30922,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3267, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1102),
+            id: DeclarationId(1109),
             name: Some("PortStateExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2304),
+                        ty: DeclarationId(2327),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2305),
+                        ty: DeclarationId(2328),
                     },
                 ],
             },
@@ -30725,21 +30947,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3752, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1103),
+            id: DeclarationId(1110),
             name: Some("AlgebraicLawKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2306),
+                        ty: DeclarationId(2329),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2307),
+                        ty: DeclarationId(2330),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2308),
+                        ty: DeclarationId(2331),
                     },
                 ],
             },
@@ -30754,101 +30976,101 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4594, 4664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1104),
+            id: DeclarationId(1111),
             name: Some("TestPredicate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2309),
+                        ty: DeclarationId(2332),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2310),
+                        ty: DeclarationId(2333),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2311),
+                        ty: DeclarationId(2334),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2312),
+                        ty: DeclarationId(2335),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2313),
+                        ty: DeclarationId(2336),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2314),
+                        ty: DeclarationId(2337),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2315),
+                        ty: DeclarationId(2338),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2316),
+                        ty: DeclarationId(2339),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2318),
+                        ty: DeclarationId(2341),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2320),
+                        ty: DeclarationId(2343),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2321),
+                        ty: DeclarationId(2344),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2322),
+                        ty: DeclarationId(2345),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2323),
+                        ty: DeclarationId(2346),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2324),
+                        ty: DeclarationId(2347),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2325),
+                        ty: DeclarationId(2348),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2326),
+                        ty: DeclarationId(2349),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2327),
+                        ty: DeclarationId(2350),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2328),
+                        ty: DeclarationId(2351),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2329),
+                        ty: DeclarationId(2352),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2331),
+                        ty: DeclarationId(2354),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2332),
+                        ty: DeclarationId(2355),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2333),
+                        ty: DeclarationId(2356),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2334),
+                        ty: DeclarationId(2357),
                     },
                 ],
             },
@@ -30863,7 +31085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4666, 15001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1105),
+            id: DeclarationId(1112),
             name: Some("ProgramInput".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30877,12 +31099,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 15109, 15129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1106),
+            id: DeclarationId(1113),
             name: Some("ProgramOutputBind".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "output_ref".to_string(),
-                    ty: DeclarationId(1120),
+                    ty: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
@@ -30896,7 +31118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 15272, 15327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1107),
+            id: DeclarationId(1114),
             name: Some("TestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -30914,11 +31136,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1104),
+                        ty: DeclarationId(1111),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2335),
+                        ty: DeclarationId(2358),
                     },
                 ],
             },
@@ -30933,7 +31155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 15937, 16070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1108),
+            id: DeclarationId(1115),
             name: Some("TestSuite".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -30943,7 +31165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2336),
+                        ty: DeclarationId(2359),
                     },
                 ],
             },
@@ -30958,7 +31180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16072, 16131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1109),
+            id: DeclarationId(1116),
             name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -30968,7 +31190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2337),
+                        ty: DeclarationId(2360),
                     },
                 ],
             },
@@ -30983,11 +31205,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16329, 16410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1110),
+            id: DeclarationId(1117),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1107)],
-                output: DeclarationId(2289),
+                inputs: vec![DeclarationId(1114)],
+                output: DeclarationId(2312),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     16852,
@@ -31005,11 +31227,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16781, 16868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1111),
+            id: DeclarationId(1118),
             name: Some("obligation_for_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1107)],
-                output: DeclarationId(1109),
+                inputs: vec![DeclarationId(1114)],
+                output: DeclarationId(1116),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     16926,
@@ -31027,11 +31249,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16870, 17011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1112),
+            id: DeclarationId(1119),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2290)],
-                output: DeclarationId(2291),
+                inputs: vec![DeclarationId(2313)],
+                output: DeclarationId(2314),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     17094,
@@ -31049,11 +31271,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17013, 17133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1113),
+            id: DeclarationId(1120),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747)],
-                output: DeclarationId(2338),
+                output: DeclarationId(2361),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(280))),
             },
             type_params: vec![],
@@ -31067,7 +31289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1114),
+            id: DeclarationId(1121),
             name: Some("ValueBehavior".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -31081,7 +31303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1115),
+            id: DeclarationId(1122),
             name: Some("Transform".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -31095,7 +31317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1116),
+            id: DeclarationId(1123),
             name: Some("Branch".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -31109,7 +31331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1117),
+            id: DeclarationId(1124),
             name: Some("Loop".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -31123,7 +31345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1118),
+            id: DeclarationId(1125),
             name: Some("Bind".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -31137,7 +31359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1119),
+            id: DeclarationId(1126),
             name: Some("Main".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -31151,7 +31373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1120),
+            id: DeclarationId(1127),
             name: Some("DeclarationRef".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -31165,7 +31387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1121),
+            id: DeclarationId(1128),
             name: Some("go_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(867),
@@ -31181,14 +31403,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1952),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1948),
+                            constructor: DeclarationId(1955),
                             payload: vec![],
                         },
                     ),
@@ -31199,7 +31421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2050, 2152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1122),
+            id: DeclarationId(1129),
             name: Some("go_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(869),
@@ -31229,7 +31451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2154, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1123),
+            id: DeclarationId(1130),
             name: Some("go_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(871),
@@ -31250,22 +31472,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2306, 2381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1124),
+            id: DeclarationId(1131),
             name: Some("go_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31288,22 +31510,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2383, 2513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1125),
+            id: DeclarationId(1132),
             name: Some("go_int32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31326,22 +31548,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2515, 2649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1126),
+            id: DeclarationId(1133),
             name: Some("go_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -31354,15 +31576,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2030),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1637),
+                                constructor: DeclarationId(1644),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1636),
+                                        constructor: DeclarationId(1643),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1634),
+                                            constructor: DeclarationId(1641),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -31374,7 +31596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1125)),
+                        FieldValue::Reference(DeclarationId(1132)),
                     ),
                 ],
             }),
@@ -31383,22 +31605,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2651, 2954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1127),
+            id: DeclarationId(1134),
             name: Some("go_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31421,22 +31643,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 2956, 3087),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1128),
+            id: DeclarationId(1135),
             name: Some("go_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31459,22 +31681,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3089, 3226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1129),
+            id: DeclarationId(1136),
             name: Some("go_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31497,22 +31719,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3228, 3366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1130),
+            id: DeclarationId(1137),
             name: Some("go_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31535,22 +31757,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3368, 3506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1131),
+            id: DeclarationId(1138),
             name: Some("go_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31573,22 +31795,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3508, 3667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1132),
+            id: DeclarationId(1139),
             name: Some("go_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31611,22 +31833,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3669, 3816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1133),
+            id: DeclarationId(1140),
             name: Some("go_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31650,7 +31872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -31670,22 +31892,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 3818, 4059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1134),
+            id: DeclarationId(1141),
             name: Some("go_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31708,22 +31930,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4061, 4209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1135),
+            id: DeclarationId(1142),
             name: Some("go_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31748,7 +31970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31767,7 +31989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -31788,7 +32010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -31809,22 +32031,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4211, 4594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1136),
+            id: DeclarationId(1143),
             name: Some("go_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31849,7 +32071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -31868,7 +32090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -31887,7 +32109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -31908,22 +32130,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4596, 4990),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1137),
+            id: DeclarationId(1144),
             name: Some("go_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31946,22 +32168,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 4992, 5146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1138),
+            id: DeclarationId(1145),
             name: Some("go_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -31984,22 +32206,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5148, 5302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1139),
+            id: DeclarationId(1146),
             name: Some("go_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32022,22 +32244,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5304, 5473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1140),
+            id: DeclarationId(1147),
             name: Some("go_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32060,22 +32282,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5475, 5619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1141),
+            id: DeclarationId(1148),
             name: Some("go_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32100,22 +32322,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5621, 5806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1142),
+            id: DeclarationId(1149),
             name: Some("go_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32138,22 +32360,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5808, 5968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1143),
+            id: DeclarationId(1150),
             name: Some("go_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32178,7 +32400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -32197,7 +32419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -32218,22 +32440,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 5970, 6272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1144),
+            id: DeclarationId(1151),
             name: Some("go_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32260,7 +32482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -32279,7 +32501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -32300,22 +32522,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6274, 6611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1145),
+            id: DeclarationId(1152),
             name: Some("go_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32342,7 +32564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -32361,7 +32583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -32382,22 +32604,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6613, 6954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1146),
+            id: DeclarationId(1153),
             name: Some("go_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32423,7 +32645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -32443,22 +32665,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 6956, 7228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1147),
+            id: DeclarationId(1154),
             name: Some("go_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32483,7 +32705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -32502,7 +32724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -32523,22 +32745,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7230, 7541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1148),
+            id: DeclarationId(1155),
             name: Some("go_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32563,7 +32785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -32582,7 +32804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -32603,22 +32825,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7543, 7859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1149),
+            id: DeclarationId(1156),
             name: Some("go_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32643,7 +32865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -32662,7 +32884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -32681,7 +32903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -32702,22 +32924,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 7861, 8270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1150),
+            id: DeclarationId(1157),
             name: Some("go_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32742,7 +32964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -32761,7 +32983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -32782,22 +33004,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8272, 8588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1151),
+            id: DeclarationId(1158),
             name: Some("go_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32821,7 +33043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2009),
+                                    constructor: DeclarationId(2032),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -32841,22 +33063,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8590, 8831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1152),
+            id: DeclarationId(1159),
             name: Some("go_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32880,7 +33102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -32900,22 +33122,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 8833, 9074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1153),
+            id: DeclarationId(1160),
             name: Some("go_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32939,7 +33161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -32959,22 +33181,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9076, 9335),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1154),
+            id: DeclarationId(1161),
             name: Some("go_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -32999,7 +33221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -33020,7 +33242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -33041,22 +33263,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9337, 9670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1155),
+            id: DeclarationId(1162),
             name: Some("go_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33079,22 +33301,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9672, 9823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1156),
+            id: DeclarationId(1163),
             name: Some("go_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33117,22 +33339,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9825, 9973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1157),
+            id: DeclarationId(1164),
             name: Some("go_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33155,22 +33377,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 9975, 10123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1158),
+            id: DeclarationId(1165),
             name: Some("go_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33193,22 +33415,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10125, 10288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1159),
+            id: DeclarationId(1166),
             name: Some("go_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33233,7 +33455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33252,7 +33474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -33273,7 +33495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -33294,7 +33516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -33315,7 +33537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -33336,7 +33558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -33357,7 +33579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -33378,7 +33600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -33399,7 +33621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -33418,7 +33640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33439,22 +33661,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 10290, 11307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1160),
+            id: DeclarationId(1167),
             name: Some("go_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33477,22 +33699,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11309, 11466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1161),
+            id: DeclarationId(1168),
             name: Some("go_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33515,22 +33737,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11468, 11625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1162),
+            id: DeclarationId(1169),
             name: Some("go_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33553,22 +33775,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11627, 11775),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1163),
+            id: DeclarationId(1170),
             name: Some("go_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33591,22 +33813,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11777, 11934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1164),
+            id: DeclarationId(1171),
             name: Some("go_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33629,22 +33851,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 11936, 12102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1165),
+            id: DeclarationId(1172),
             name: Some("go_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33667,22 +33889,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12104, 12264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1166),
+            id: DeclarationId(1173),
             name: Some("go_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33709,7 +33931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -33730,7 +33952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -33751,22 +33973,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12266, 12617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1167),
+            id: DeclarationId(1174),
             name: Some("go_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33791,7 +34013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -33812,7 +34034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33831,7 +34053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -33850,7 +34072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -33871,22 +34093,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 12619, 13106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1168),
+            id: DeclarationId(1175),
             name: Some("go_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33909,22 +34131,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 13108, 13256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1169),
+            id: DeclarationId(1176),
             name: Some("go_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -33949,7 +34171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33968,7 +34190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -33989,7 +34211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34008,7 +34230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34029,22 +34251,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 13730, 14204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1170),
+            id: DeclarationId(1177),
             name: Some("go_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -34069,7 +34291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -34088,7 +34310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -34107,7 +34329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -34128,7 +34350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34147,7 +34369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34168,22 +34390,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 14206, 14771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1171),
+            id: DeclarationId(1178),
             name: Some("go_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -34208,7 +34430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -34227,7 +34449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -34246,7 +34468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -34267,7 +34489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34286,7 +34508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34307,7 +34529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -34328,22 +34550,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 14773, 15430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1172),
+            id: DeclarationId(1179),
             name: Some("go_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -34368,7 +34590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -34387,7 +34609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -34406,7 +34628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -34425,7 +34647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -34444,7 +34666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -34465,7 +34687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34484,7 +34706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34505,22 +34727,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 15432, 16134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1173),
+            id: DeclarationId(1180),
             name: Some("go_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -34545,7 +34767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -34564,7 +34786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34585,7 +34807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34604,7 +34826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -34623,7 +34845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34644,7 +34866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -34665,22 +34887,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16136, 16787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1174),
+            id: DeclarationId(1181),
             name: Some("go_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -34703,22 +34925,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16789, 16933),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1175),
+            id: DeclarationId(1182),
             name: Some("go_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -34745,7 +34967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -34764,7 +34986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -34783,7 +35005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -34804,7 +35026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -34825,26 +35047,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 16935, 17402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1176),
+            id: DeclarationId(1183),
             name: Some("go_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1022)),
+                        FieldValue::Reference(DeclarationId(1029)),
                     ),
                     (
                         "carrier".to_string(),
@@ -34864,7 +35086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -34884,26 +35106,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17705, 17946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1177),
+            id: DeclarationId(1184),
             name: Some("go_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1035)),
+                        FieldValue::Reference(DeclarationId(1042)),
                     ),
                     (
                         "carrier".to_string(),
@@ -34922,26 +35144,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 17948, 18102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1178),
+            id: DeclarationId(1185),
             name: Some("go_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1023)),
+                        FieldValue::Reference(DeclarationId(1030)),
                     ),
                     (
                         "carrier".to_string(),
@@ -34962,7 +35184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34981,7 +35203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -35002,7 +35224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -35023,26 +35245,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18104, 18502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1179),
+            id: DeclarationId(1186),
             name: Some("go_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1024)),
+                        FieldValue::Reference(DeclarationId(1031)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35063,7 +35285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -35082,7 +35304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -35103,26 +35325,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18504, 18813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1180),
+            id: DeclarationId(1187),
             name: Some("go_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1025)),
+                        FieldValue::Reference(DeclarationId(1032)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35143,7 +35365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -35162,7 +35384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -35181,7 +35403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35202,26 +35424,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 18815, 19217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1181),
+            id: DeclarationId(1188),
             name: Some("go_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1026)),
+                        FieldValue::Reference(DeclarationId(1033)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35240,26 +35462,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19219, 19382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1182),
+            id: DeclarationId(1189),
             name: Some("go_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1027)),
+                        FieldValue::Reference(DeclarationId(1034)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35278,26 +35500,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19384, 19538),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1183),
+            id: DeclarationId(1190),
             name: Some("go_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1028)),
+                        FieldValue::Reference(DeclarationId(1035)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35318,7 +35540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -35337,7 +35559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -35356,7 +35578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35377,26 +35599,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19540, 19951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1184),
+            id: DeclarationId(1191),
             name: Some("go_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1029)),
+                        FieldValue::Reference(DeclarationId(1036)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35417,7 +35639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -35438,7 +35660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -35457,7 +35679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -35476,7 +35698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35497,26 +35719,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 19953, 20438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1185),
+            id: DeclarationId(1192),
             name: Some("go_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1030)),
+                        FieldValue::Reference(DeclarationId(1037)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35537,7 +35759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -35556,7 +35778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -35575,7 +35797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35596,26 +35818,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20440, 20846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1186),
+            id: DeclarationId(1193),
             name: Some("go_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1031)),
+                        FieldValue::Reference(DeclarationId(1038)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35636,7 +35858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -35655,7 +35877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -35674,7 +35896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -35695,26 +35917,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 20848, 21266),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1187),
+            id: DeclarationId(1194),
             name: Some("go_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1032)),
+                        FieldValue::Reference(DeclarationId(1039)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35733,26 +35955,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21268, 21431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1188),
+            id: DeclarationId(1195),
             name: Some("go_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1033)),
+                        FieldValue::Reference(DeclarationId(1040)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35771,26 +35993,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21433, 21596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1189),
+            id: DeclarationId(1196),
             name: Some("go_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1034)),
+                        FieldValue::Reference(DeclarationId(1041)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35809,22 +36031,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21598, 21752),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1190),
+            id: DeclarationId(1197),
             name: Some("go_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -35843,22 +36065,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21754, 21895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1191),
+            id: DeclarationId(1198),
             name: Some("go_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -35877,22 +36099,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 21897, 22038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1192),
+            id: DeclarationId(1199),
             name: Some("go_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -35911,22 +36133,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22040, 22181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1193),
+            id: DeclarationId(1200),
             name: Some("go_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -35947,22 +36169,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22183, 22331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1194),
+            id: DeclarationId(1201),
             name: Some("go_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -35981,22 +36203,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22333, 22473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1195),
+            id: DeclarationId(1202),
             name: Some("go_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36015,22 +36237,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22475, 22622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1196),
+            id: DeclarationId(1203),
             name: Some("go_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36049,22 +36271,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22624, 22771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1197),
+            id: DeclarationId(1204),
             name: Some("go_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36083,22 +36305,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22773, 22934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1198),
+            id: DeclarationId(1205),
             name: Some("go_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36117,22 +36339,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 22936, 23076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1199),
+            id: DeclarationId(1206),
             name: Some("go_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36151,22 +36373,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23078, 23225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1200),
+            id: DeclarationId(1207),
             name: Some("go_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36185,22 +36407,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23227, 23374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1201),
+            id: DeclarationId(1208),
             name: Some("go_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36219,22 +36441,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23376, 23537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1202),
+            id: DeclarationId(1209),
             name: Some("go_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36253,22 +36475,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23539, 23678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1203),
+            id: DeclarationId(1210),
             name: Some("go_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36287,22 +36509,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23680, 23820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1204),
+            id: DeclarationId(1211),
             name: Some("go_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36321,22 +36543,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23822, 23961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1205),
+            id: DeclarationId(1212),
             name: Some("go_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36355,22 +36577,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 23963, 24103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1206),
+            id: DeclarationId(1213),
             name: Some("go_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36389,22 +36611,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24105, 24254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1207),
+            id: DeclarationId(1214),
             name: Some("go_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36423,26 +36645,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24256, 24405),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1208),
+            id: DeclarationId(1215),
             name: Some("go_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1118)),
+                        FieldValue::Reference(DeclarationId(1125)),
                     ),
                     (
                         "carrier".to_string(),
@@ -36458,26 +36680,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24407, 24540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1209),
+            id: DeclarationId(1216),
             name: Some("go_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1116)),
+                        FieldValue::Reference(DeclarationId(1123)),
                     ),
                     (
                         "carrier".to_string(),
@@ -36493,26 +36715,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24542, 24685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1210),
+            id: DeclarationId(1217),
             name: Some("go_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1119)),
+                        FieldValue::Reference(DeclarationId(1126)),
                     ),
                     (
                         "carrier".to_string(),
@@ -36528,22 +36750,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24687, 24840),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1211),
+            id: DeclarationId(1218),
             name: Some("go_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36552,7 +36774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2044),
                             payload: vec![],
                         },
                     ),
@@ -36565,22 +36787,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24842, 24980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1212),
+            id: DeclarationId(1219),
             name: Some("go_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36589,7 +36811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2045),
                             payload: vec![],
                         },
                     ),
@@ -36600,7 +36822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2012),
+                                    constructor: DeclarationId(2035),
                                     payload: vec![],
                                 },
                             ),
@@ -36614,22 +36836,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 24982, 25174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1213),
+            id: DeclarationId(1220),
             name: Some("go_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36638,7 +36860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -36650,7 +36872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -36660,7 +36882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -36675,22 +36897,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25176, 25393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1214),
+            id: DeclarationId(1221),
             name: Some("go_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36699,7 +36921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![],
                         },
                     ),
@@ -36711,7 +36933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -36721,7 +36943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -36736,22 +36958,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25395, 25618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1215),
+            id: DeclarationId(1222),
             name: Some("go_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36760,7 +36982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2048),
                             payload: vec![],
                         },
                     ),
@@ -36771,7 +36993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2011),
+                                    constructor: DeclarationId(2034),
                                     payload: vec![],
                                 },
                             ),
@@ -36785,22 +37007,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25620, 25803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1216),
+            id: DeclarationId(1223),
             name: Some("go_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36818,22 +37040,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 25805, 25941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1217),
+            id: DeclarationId(1224),
             name: Some("go_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36853,22 +37075,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26627, 26780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1218),
+            id: DeclarationId(1225),
             name: Some("go_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36886,22 +37108,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26782, 26922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1219),
+            id: DeclarationId(1226),
             name: Some("go_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36910,7 +37132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2049),
                             payload: vec![],
                         },
                     ),
@@ -36921,7 +37143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2011),
+                                    constructor: DeclarationId(2034),
                                     payload: vec![],
                                 },
                             ),
@@ -36935,22 +37157,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 26924, 27112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1220),
+            id: DeclarationId(1227),
             name: Some("go_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -36959,7 +37181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2027),
+                            constructor: DeclarationId(2050),
                             payload: vec![],
                         },
                     ),
@@ -36971,7 +37193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -36981,7 +37203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -36991,7 +37213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -37006,22 +37228,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27114, 27371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1221),
+            id: DeclarationId(1228),
             name: Some("go_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -37030,7 +37252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2028),
+                            constructor: DeclarationId(2051),
                             payload: vec![],
                         },
                     ),
@@ -37042,7 +37264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -37052,7 +37274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -37067,22 +37289,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27373, 27587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1222),
+            id: DeclarationId(1229),
             name: Some("go_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -37091,7 +37313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2029),
+                            constructor: DeclarationId(2052),
                             payload: vec![],
                         },
                     ),
@@ -37103,7 +37325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -37113,7 +37335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -37128,22 +37350,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27589, 27812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1223),
+            id: DeclarationId(1230),
             name: Some("go_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -37152,7 +37374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2030),
+                            constructor: DeclarationId(2053),
                             payload: vec![],
                         },
                     ),
@@ -37164,7 +37386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -37174,7 +37396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -37189,22 +37411,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 27814, 28043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1224),
+            id: DeclarationId(1231),
             name: Some("go_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "target".to_string(),
@@ -37213,17 +37435,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2032),
+                            constructor: DeclarationId(2055),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1543)),
+                        FieldValue::Reference(DeclarationId(1550)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1545)),
+                        FieldValue::Reference(DeclarationId(1552)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -37253,15 +37475,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28130, 28436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1225),
+            id: DeclarationId(1232),
             name: Some("go_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(927),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(927)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37283,15 +37505,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28438, 28568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1226),
+            id: DeclarationId(1233),
             name: Some("go_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(935),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(935)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37317,15 +37539,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28570, 28730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1227),
+            id: DeclarationId(1234),
             name: Some("go_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(937),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(937)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37362,15 +37584,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28732, 28933),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1228),
+            id: DeclarationId(1235),
             name: Some("go_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(931),
+                template: DeclarationId(938),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(931)),
+            meta_tag: Some(DeclarationId(938)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37394,15 +37616,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 28935, 29045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1229),
+            id: DeclarationId(1236),
             name: Some("go_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(939),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(939)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37416,15 +37638,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29047, 29104),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1230),
+            id: DeclarationId(1237),
             name: Some("go_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(933),
+                template: DeclarationId(940),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(933)),
+            meta_tag: Some(DeclarationId(940)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37462,15 +37684,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29106, 29391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1231),
+            id: DeclarationId(1238),
             name: Some("go_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(934),
+                template: DeclarationId(941),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(934)),
+            meta_tag: Some(DeclarationId(941)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37484,15 +37706,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29393, 29472),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1232),
+            id: DeclarationId(1239),
             name: Some("go_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(935),
+                template: DeclarationId(942),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(935)),
+            meta_tag: Some(DeclarationId(942)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37528,15 +37750,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29474, 29697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1233),
+            id: DeclarationId(1240),
             name: Some("go_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(937),
+                template: DeclarationId(944),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(937)),
+            meta_tag: Some(DeclarationId(944)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37582,54 +37804,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29699, 29991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1234),
+            id: DeclarationId(1241),
             name: Some("go_collection_ops".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(938),
+                template: DeclarationId(945),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(938)),
+            meta_tag: Some(DeclarationId(945)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "concat_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(950)),
+                        FieldValue::Reference(DeclarationId(957)),
                     ),
                     (
                         "length_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(951)),
+                        FieldValue::Reference(DeclarationId(958)),
                     ),
                     (
                         "is_empty_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(952)),
+                        FieldValue::Reference(DeclarationId(959)),
                     ),
                     (
                         "fold_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(953)),
+                        FieldValue::Reference(DeclarationId(960)),
                     ),
                     (
                         "filter_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(955)),
+                        FieldValue::Reference(DeclarationId(962)),
                     ),
                     (
                         "flat_map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(958)),
+                        FieldValue::Reference(DeclarationId(965)),
                     ),
                     (
                         "any_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(956)),
+                        FieldValue::Reference(DeclarationId(963)),
                     ),
                     (
                         "all_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(957)),
+                        FieldValue::Reference(DeclarationId(964)),
                     ),
                     (
                         "map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(954)),
+                        FieldValue::Reference(DeclarationId(961)),
                     ),
                     (
                         "filter".to_string(),
@@ -37666,15 +37888,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 29993, 30758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1235),
+            id: DeclarationId(1242),
             name: Some("go_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(939),
+                template: DeclarationId(946),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(939)),
+            meta_tag: Some(DeclarationId(946)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37710,15 +37932,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 30760, 31028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1236),
+            id: DeclarationId(1243),
             name: Some("go_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(936),
+                template: DeclarationId(943),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(936)),
+            meta_tag: Some(DeclarationId(943)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37738,66 +37960,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 31785, 31900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1237),
+            id: DeclarationId(1244),
             name: Some("go_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(943),
+                template: DeclarationId(950),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(943)),
+            meta_tag: Some(DeclarationId(950)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1225)),
+                        FieldValue::Reference(DeclarationId(1232)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1226)),
+                        FieldValue::Reference(DeclarationId(1233)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1227)),
+                        FieldValue::Reference(DeclarationId(1234)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1228)),
+                        FieldValue::Reference(DeclarationId(1235)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1229)),
+                        FieldValue::Reference(DeclarationId(1236)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1230)),
+                        FieldValue::Reference(DeclarationId(1237)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1231)),
+                        FieldValue::Reference(DeclarationId(1238)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1232)),
+                        FieldValue::Reference(DeclarationId(1239)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1236)),
+                        FieldValue::Reference(DeclarationId(1243)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1233)),
+                        FieldValue::Reference(DeclarationId(1240)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1234)),
+                        FieldValue::Reference(DeclarationId(1241)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1235)),
+                        FieldValue::Reference(DeclarationId(1242)),
                     ),
                 ],
             }),
@@ -37806,7 +38028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 31902, 32321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1238),
+            id: DeclarationId(1245),
             name: Some("go_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(841),
@@ -37842,7 +38064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 33988, 34124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1239),
+            id: DeclarationId(1246),
             name: Some("go_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(832),
@@ -37858,55 +38080,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1881),
+                            constructor: DeclarationId(1888),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1884),
+                            constructor: DeclarationId(1891),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1887),
+                            constructor: DeclarationId(1894),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1890),
+                            constructor: DeclarationId(1897),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1894),
+                            constructor: DeclarationId(1901),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1896),
+                            constructor: DeclarationId(1903),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1900),
+                            constructor: DeclarationId(1907),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -37932,7 +38154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1903),
+                                    constructor: DeclarationId(1910),
                                     payload: vec![],
                                 },
                             ),
@@ -37945,7 +38167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 34126, 34684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1240),
+            id: DeclarationId(1247),
             name: Some("go_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(833),
@@ -37960,11 +38182,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1239)),
+                        FieldValue::Reference(DeclarationId(1246)),
                     ),
                 ],
             }),
@@ -37973,15 +38195,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/go.dag", 34686, 34810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1241),
+            id: DeclarationId(1248),
             name: Some("python_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(927),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(927)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38001,15 +38223,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2347, 2469),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1242),
+            id: DeclarationId(1249),
             name: Some("python_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(935),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(935)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38035,15 +38257,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2471, 2624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1243),
+            id: DeclarationId(1250),
             name: Some("python_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(937),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(937)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38080,15 +38302,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2626, 2841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1244),
+            id: DeclarationId(1251),
             name: Some("python_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(931),
+                template: DeclarationId(938),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(931)),
+            meta_tag: Some(DeclarationId(938)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38112,15 +38334,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2843, 2957),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1245),
+            id: DeclarationId(1252),
             name: Some("python_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(939),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(939)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38134,15 +38356,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 2959, 3020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1246),
+            id: DeclarationId(1253),
             name: Some("python_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(933),
+                template: DeclarationId(940),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(933)),
+            meta_tag: Some(DeclarationId(940)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38180,15 +38402,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3022, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1247),
+            id: DeclarationId(1254),
             name: Some("python_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(934),
+                template: DeclarationId(941),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(934)),
+            meta_tag: Some(DeclarationId(941)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38204,15 +38426,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3331, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1248),
+            id: DeclarationId(1255),
             name: Some("python_type_definitions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(935),
+                template: DeclarationId(942),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(935)),
+            meta_tag: Some(DeclarationId(942)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38252,15 +38474,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3432, 3763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1249),
+            id: DeclarationId(1256),
             name: Some("python_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(937),
+                template: DeclarationId(944),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(937)),
+            meta_tag: Some(DeclarationId(944)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38306,54 +38528,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 3765, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1250),
+            id: DeclarationId(1257),
             name: Some("python_collections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(938),
+                template: DeclarationId(945),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(938)),
+            meta_tag: Some(DeclarationId(945)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "concat_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1036)),
+                        FieldValue::Reference(DeclarationId(1043)),
                     ),
                     (
                         "length_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1037)),
+                        FieldValue::Reference(DeclarationId(1044)),
                     ),
                     (
                         "is_empty_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1038)),
+                        FieldValue::Reference(DeclarationId(1045)),
                     ),
                     (
                         "fold_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1039)),
+                        FieldValue::Reference(DeclarationId(1046)),
                     ),
                     (
                         "filter_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1041)),
+                        FieldValue::Reference(DeclarationId(1048)),
                     ),
                     (
                         "flat_map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1044)),
+                        FieldValue::Reference(DeclarationId(1051)),
                     ),
                     (
                         "any_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1042)),
+                        FieldValue::Reference(DeclarationId(1049)),
                     ),
                     (
                         "all_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1043)),
+                        FieldValue::Reference(DeclarationId(1050)),
                     ),
                     (
                         "map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1040)),
+                        FieldValue::Reference(DeclarationId(1047)),
                     ),
                     (
                         "filter".to_string(),
@@ -38384,15 +38606,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4097, 4861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1251),
+            id: DeclarationId(1258),
             name: Some("python_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(939),
+                template: DeclarationId(946),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(939)),
+            meta_tag: Some(DeclarationId(946)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38424,15 +38646,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 4863, 5115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1252),
+            id: DeclarationId(1259),
             name: Some("python_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(936),
+                template: DeclarationId(943),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(936)),
+            meta_tag: Some(DeclarationId(943)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -38452,66 +38674,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1253),
+            id: DeclarationId(1260),
             name: Some("python_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(943),
+                template: DeclarationId(950),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(943)),
+            meta_tag: Some(DeclarationId(950)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1241)),
+                        FieldValue::Reference(DeclarationId(1248)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1242)),
+                        FieldValue::Reference(DeclarationId(1249)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1243)),
+                        FieldValue::Reference(DeclarationId(1250)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1244)),
+                        FieldValue::Reference(DeclarationId(1251)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1245)),
+                        FieldValue::Reference(DeclarationId(1252)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1246)),
+                        FieldValue::Reference(DeclarationId(1253)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1247)),
+                        FieldValue::Reference(DeclarationId(1254)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1248)),
+                        FieldValue::Reference(DeclarationId(1255)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1252)),
+                        FieldValue::Reference(DeclarationId(1259)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1249)),
+                        FieldValue::Reference(DeclarationId(1256)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1250)),
+                        FieldValue::Reference(DeclarationId(1257)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1251)),
+                        FieldValue::Reference(DeclarationId(1258)),
                     ),
                 ],
             }),
@@ -38520,7 +38742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5439, 5914),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1254),
+            id: DeclarationId(1261),
             name: Some("python_target".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(867),
@@ -38536,14 +38758,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1945),
+                            constructor: DeclarationId(1952),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1948),
+                            constructor: DeclarationId(1955),
                             payload: vec![],
                         },
                     ),
@@ -38554,7 +38776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 5916, 6013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1255),
+            id: DeclarationId(1262),
             name: Some("python_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(869),
@@ -38582,7 +38804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1256),
+            id: DeclarationId(1263),
             name: Some("python_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(871),
@@ -38603,22 +38825,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6153, 6232),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1257),
+            id: DeclarationId(1264),
             name: Some("python_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -38641,22 +38863,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6234, 6370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1258),
+            id: DeclarationId(1265),
             name: Some("python_integer_inhabit_at_i32_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -38669,15 +38891,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2030),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1637),
+                                constructor: DeclarationId(1644),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1636),
+                                        constructor: DeclarationId(1643),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1634),
+                                            constructor: DeclarationId(1641),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -38689,7 +38911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1257)),
+                        FieldValue::Reference(DeclarationId(1264)),
                     ),
                 ],
             }),
@@ -38698,22 +38920,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6463, 6772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1259),
+            id: DeclarationId(1266),
             name: Some("python_integer_inhabit_unbounded_decl".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -38726,16 +38948,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2030),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1638),
+                                constructor: DeclarationId(1645),
                                 payload: vec![],
                             }],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1257)),
+                        FieldValue::Reference(DeclarationId(1264)),
                     ),
                 ],
             }),
@@ -38744,22 +38966,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 6850, 7060),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1260),
+            id: DeclarationId(1267),
             name: Some("python_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -38782,22 +39004,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7062, 7201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1261),
+            id: DeclarationId(1268),
             name: Some("python_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -38820,22 +39042,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7203, 7345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1262),
+            id: DeclarationId(1269),
             name: Some("python_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -38858,22 +39080,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7347, 7493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1263),
+            id: DeclarationId(1270),
             name: Some("python_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -38896,22 +39118,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7495, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1264),
+            id: DeclarationId(1271),
             name: Some("python_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -38934,26 +39156,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7643, 7810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1265),
+            id: DeclarationId(1272),
             name: Some("python_declaration_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1120)),
+                        FieldValue::Reference(DeclarationId(1127)),
                     ),
                     (
                         "carrier".to_string(),
@@ -38972,22 +39194,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7812, 7981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1266),
+            id: DeclarationId(1273),
             name: Some("python_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -39010,22 +39232,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 7983, 8142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1267),
+            id: DeclarationId(1274),
             name: Some("python_dag_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -39048,22 +39270,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8144, 8294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1268),
+            id: DeclarationId(1275),
             name: Some("python_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -39086,22 +39308,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8296, 8455),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1269),
+            id: DeclarationId(1276),
             name: Some("python_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -39124,22 +39346,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8457, 8613),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1270),
+            id: DeclarationId(1277),
             name: Some("python_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -39162,22 +39384,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8615, 8783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1271),
+            id: DeclarationId(1278),
             name: Some("python_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -39200,22 +39422,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8785, 8944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1272),
+            id: DeclarationId(1279),
             name: Some("python_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -39238,22 +39460,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 8946, 9099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1273),
+            id: DeclarationId(1280),
             name: Some("python_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -39276,22 +39498,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9101, 9254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1274),
+            id: DeclarationId(1281),
             name: Some("python_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -39314,22 +39536,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9256, 9408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1275),
+            id: DeclarationId(1282),
             name: Some("python_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -39352,26 +39574,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9410, 9547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1276),
+            id: DeclarationId(1283),
             name: Some("python_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1022)),
+                        FieldValue::Reference(DeclarationId(1029)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39391,7 +39613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -39411,26 +39633,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9621, 9870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1277),
+            id: DeclarationId(1284),
             name: Some("python_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1035)),
+                        FieldValue::Reference(DeclarationId(1042)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39449,26 +39671,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 9872, 10034),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1278),
+            id: DeclarationId(1285),
             name: Some("python_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1023)),
+                        FieldValue::Reference(DeclarationId(1030)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39489,7 +39711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39508,7 +39730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -39529,7 +39751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -39550,26 +39772,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10036, 10442),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1279),
+            id: DeclarationId(1286),
             name: Some("python_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1024)),
+                        FieldValue::Reference(DeclarationId(1031)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39590,7 +39812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39609,7 +39831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -39630,26 +39852,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10444, 10761),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1280),
+            id: DeclarationId(1287),
             name: Some("python_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1025)),
+                        FieldValue::Reference(DeclarationId(1032)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39670,7 +39892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39689,7 +39911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -39708,7 +39930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -39729,26 +39951,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 10763, 11173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1281),
+            id: DeclarationId(1288),
             name: Some("python_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1026)),
+                        FieldValue::Reference(DeclarationId(1033)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39767,26 +39989,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11175, 11346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1282),
+            id: DeclarationId(1289),
             name: Some("python_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1027)),
+                        FieldValue::Reference(DeclarationId(1034)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39805,26 +40027,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11348, 11510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1283),
+            id: DeclarationId(1290),
             name: Some("python_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1028)),
+                        FieldValue::Reference(DeclarationId(1035)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39845,7 +40067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -39864,7 +40086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -39883,7 +40105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -39904,26 +40126,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11512, 11931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1284),
+            id: DeclarationId(1291),
             name: Some("python_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1029)),
+                        FieldValue::Reference(DeclarationId(1036)),
                     ),
                     (
                         "carrier".to_string(),
@@ -39944,7 +40166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -39965,7 +40187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -39984,7 +40206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -40003,7 +40225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -40024,26 +40246,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 11933, 12426),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1285),
+            id: DeclarationId(1292),
             name: Some("python_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1030)),
+                        FieldValue::Reference(DeclarationId(1037)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40064,7 +40286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -40083,7 +40305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -40102,7 +40324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -40123,26 +40345,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12428, 12842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1286),
+            id: DeclarationId(1293),
             name: Some("python_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1031)),
+                        FieldValue::Reference(DeclarationId(1038)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40163,7 +40385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -40182,7 +40404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -40201,7 +40423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -40222,26 +40444,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 12844, 13270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1287),
+            id: DeclarationId(1294),
             name: Some("python_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1032)),
+                        FieldValue::Reference(DeclarationId(1039)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40260,26 +40482,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13272, 13443),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1288),
+            id: DeclarationId(1295),
             name: Some("python_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1033)),
+                        FieldValue::Reference(DeclarationId(1040)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40298,26 +40520,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13445, 13616),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1289),
+            id: DeclarationId(1296),
             name: Some("python_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1034)),
+                        FieldValue::Reference(DeclarationId(1041)),
                     ),
                     (
                         "carrier".to_string(),
@@ -40336,22 +40558,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13618, 13780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1290),
+            id: DeclarationId(1297),
             name: Some("python_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40370,22 +40592,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13782, 13931),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1291),
+            id: DeclarationId(1298),
             name: Some("python_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40404,22 +40626,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 13933, 14082),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1292),
+            id: DeclarationId(1299),
             name: Some("python_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40438,22 +40660,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14084, 14233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1293),
+            id: DeclarationId(1300),
             name: Some("python_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40474,22 +40696,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14235, 14394),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1294),
+            id: DeclarationId(1301),
             name: Some("python_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40508,22 +40730,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14396, 14544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1295),
+            id: DeclarationId(1302),
             name: Some("python_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40542,22 +40764,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14546, 14701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1296),
+            id: DeclarationId(1303),
             name: Some("python_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40576,22 +40798,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14703, 14858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1297),
+            id: DeclarationId(1304),
             name: Some("python_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40610,22 +40832,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 14860, 15029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1298),
+            id: DeclarationId(1305),
             name: Some("python_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40644,22 +40866,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15031, 15179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1299),
+            id: DeclarationId(1306),
             name: Some("python_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40678,22 +40900,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15181, 15328),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1300),
+            id: DeclarationId(1307),
             name: Some("python_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40712,22 +40934,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15330, 15478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1301),
+            id: DeclarationId(1308),
             name: Some("python_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40746,22 +40968,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15480, 15627),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1302),
+            id: DeclarationId(1309),
             name: Some("python_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40780,22 +41002,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15629, 15777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1303),
+            id: DeclarationId(1310),
             name: Some("python_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40814,22 +41036,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15779, 15937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1304),
+            id: DeclarationId(1311),
             name: Some("python_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40848,22 +41070,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 15939, 16096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1305),
+            id: DeclarationId(1312),
             name: Some("python_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40872,7 +41094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2044),
                             payload: vec![],
                         },
                     ),
@@ -40885,22 +41107,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16098, 16244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1306),
+            id: DeclarationId(1313),
             name: Some("python_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40909,7 +41131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2045),
                             payload: vec![],
                         },
                     ),
@@ -40920,7 +41142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2012),
+                                    constructor: DeclarationId(2035),
                                     payload: vec![],
                                 },
                             ),
@@ -40934,22 +41156,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16246, 16446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1307),
+            id: DeclarationId(1314),
             name: Some("python_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -40958,7 +41180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -40970,7 +41192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -40980,7 +41202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -40995,22 +41217,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16448, 16673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1308),
+            id: DeclarationId(1315),
             name: Some("python_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41019,7 +41241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![],
                         },
                     ),
@@ -41031,7 +41253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -41041,7 +41263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -41056,22 +41278,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16675, 16906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1309),
+            id: DeclarationId(1316),
             name: Some("python_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41080,7 +41302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2048),
                             payload: vec![],
                         },
                     ),
@@ -41091,7 +41313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2011),
+                                    constructor: DeclarationId(2034),
                                     payload: vec![],
                                 },
                             ),
@@ -41105,22 +41327,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 16908, 17099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1310),
+            id: DeclarationId(1317),
             name: Some("python_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41129,7 +41351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2049),
                             payload: vec![],
                         },
                     ),
@@ -41140,7 +41362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2011),
+                                    constructor: DeclarationId(2034),
                                     payload: vec![],
                                 },
                             ),
@@ -41154,22 +41376,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17101, 17297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1311),
+            id: DeclarationId(1318),
             name: Some("python_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41178,7 +41400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2027),
+                            constructor: DeclarationId(2050),
                             payload: vec![],
                         },
                     ),
@@ -41190,7 +41412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -41200,7 +41422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -41210,7 +41432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -41225,22 +41447,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1312),
+            id: DeclarationId(1319),
             name: Some("python_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41249,7 +41471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2028),
+                            constructor: DeclarationId(2051),
                             payload: vec![],
                         },
                     ),
@@ -41261,7 +41483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -41271,7 +41493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -41286,22 +41508,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17566, 17788),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1313),
+            id: DeclarationId(1320),
             name: Some("python_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41310,7 +41532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2029),
+                            constructor: DeclarationId(2052),
                             payload: vec![],
                         },
                     ),
@@ -41322,7 +41544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -41332,7 +41554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -41347,22 +41569,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 17790, 18021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1314),
+            id: DeclarationId(1321),
             name: Some("python_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41371,7 +41593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2030),
+                            constructor: DeclarationId(2053),
                             payload: vec![],
                         },
                     ),
@@ -41383,7 +41605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -41393,7 +41615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -41408,22 +41630,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18023, 18260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1315),
+            id: DeclarationId(1322),
             name: Some("python_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41440,24 +41662,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/python.dag", 18262, 18410),
         });
-        declarations.push(Declaration { id: DeclarationId(1316), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1253))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18526, 18764) });
+        declarations.push(Declaration { id: DeclarationId(1323), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(930), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(930)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1260))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18526, 18764) });
         declarations.push(Declaration {
-            id: DeclarationId(1317),
+            id: DeclarationId(1324),
             name: Some("python_non_empty_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41477,22 +41699,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 18855, 19029),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1318),
+            id: DeclarationId(1325),
             name: Some("python_non_singleton_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41512,22 +41734,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 19031, 19217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1319),
+            id: DeclarationId(1326),
             name: Some("python_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "target".to_string(),
@@ -41536,17 +41758,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2032),
+                            constructor: DeclarationId(2055),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1543)),
+                        FieldValue::Reference(DeclarationId(1550)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1545)),
+                        FieldValue::Reference(DeclarationId(1552)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -41576,7 +41798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 19218, 19532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1320),
+            id: DeclarationId(1327),
             name: Some("python_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(841),
@@ -41612,7 +41834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 21597, 21739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1321),
+            id: DeclarationId(1328),
             name: Some("python_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(832),
@@ -41628,55 +41850,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1881),
+                            constructor: DeclarationId(1888),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1886),
+                            constructor: DeclarationId(1893),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1887),
+                            constructor: DeclarationId(1894),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1890),
+                            constructor: DeclarationId(1897),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1894),
+                            constructor: DeclarationId(1901),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1895),
+                            constructor: DeclarationId(1902),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1900),
+                            constructor: DeclarationId(1907),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1320)),
+                        FieldValue::Reference(DeclarationId(1327)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -41705,7 +41927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1902),
+                                    constructor: DeclarationId(1909),
                                     payload: vec![],
                                 },
                             ),
@@ -41718,7 +41940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 21741, 22321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1322),
+            id: DeclarationId(1329),
             name: Some("python_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(833),
@@ -41733,11 +41955,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1253)),
+                        FieldValue::Reference(DeclarationId(1260)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1321)),
+                        FieldValue::Reference(DeclarationId(1328)),
                     ),
                 ],
             }),
@@ -41746,7 +41968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/python.dag", 22323, 22459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1323),
+            id: DeclarationId(1330),
             name: Some("rust_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(867),
@@ -41762,14 +41984,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1947),
+                            constructor: DeclarationId(1954),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1948),
+                            constructor: DeclarationId(1955),
                             payload: vec![],
                         },
                     ),
@@ -41780,7 +42002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 4798, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1324),
+            id: DeclarationId(1331),
             name: Some("rust_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(869),
@@ -41810,7 +42032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 4902, 5054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1325),
+            id: DeclarationId(1332),
             name: Some("rust_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(871),
@@ -41831,22 +42053,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5056, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1326),
+            id: DeclarationId(1333),
             name: Some("rust_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -41869,22 +42091,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5582, 5714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1327),
+            id: DeclarationId(1334),
             name: Some("rust_uint8".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -41907,22 +42129,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5716, 5851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1328),
+            id: DeclarationId(1335),
             name: Some("rust_i32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -41945,22 +42167,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5853, 5987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1329),
+            id: DeclarationId(1336),
             name: Some("rust_u32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -41983,22 +42205,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 5989, 6124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1330),
+            id: DeclarationId(1337),
             name: Some("rust_i128".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42021,22 +42243,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6126, 6263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1331),
+            id: DeclarationId(1338),
             name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -42049,15 +42271,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2030),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1637),
+                                constructor: DeclarationId(1644),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(0)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1636),
+                                        constructor: DeclarationId(1643),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1634),
+                                            constructor: DeclarationId(1641),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -42069,7 +42291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1329)),
+                        FieldValue::Reference(DeclarationId(1336)),
                     ),
                 ],
             }),
@@ -42078,22 +42300,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6684, 6983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1339),
             name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -42106,15 +42328,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2030),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1637),
+                                constructor: DeclarationId(1644),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1636),
+                                        constructor: DeclarationId(1643),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1634),
+                                            constructor: DeclarationId(1641),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -42126,7 +42348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1328)),
+                        FieldValue::Reference(DeclarationId(1335)),
                     ),
                 ],
             }),
@@ -42135,22 +42357,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 6985, 7292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1340),
             name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -42163,13 +42385,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2029),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1328)),
+                        FieldValue::Reference(DeclarationId(1335)),
                     ),
                 ],
             }),
@@ -42178,22 +42400,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7294, 7499),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1341),
             name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -42206,13 +42428,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2029),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1326)),
+                        FieldValue::Reference(DeclarationId(1333)),
                     ),
                 ],
             }),
@@ -42221,22 +42443,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7501, 7704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1342),
             name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -42249,13 +42471,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2029),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1330)),
+                        FieldValue::Reference(DeclarationId(1337)),
                     ),
                 ],
             }),
@@ -42264,22 +42486,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7706, 7915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1343),
             name: Some("rust_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42302,22 +42524,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 7917, 8052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1344),
             name: Some("rust_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42340,22 +42562,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8054, 8196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1345),
             name: Some("rust_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42378,22 +42600,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8198, 8340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1346),
             name: Some("rust_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42416,22 +42638,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8342, 8484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1347),
             name: Some("rust_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42454,22 +42676,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8486, 8649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1348),
             name: Some("rust_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42492,22 +42714,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8651, 8802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1349),
             name: Some("rust_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42531,7 +42753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -42551,22 +42773,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 8804, 9049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1350),
             name: Some("rust_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42589,22 +42811,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9051, 9203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1351),
             name: Some("rust_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42629,7 +42851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42648,7 +42870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -42669,7 +42891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -42690,22 +42912,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9205, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1352),
             name: Some("rust_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42730,7 +42952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -42749,7 +42971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -42768,7 +42990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -42789,22 +43011,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 9603, 10001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1353),
             name: Some("rust_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42827,22 +43049,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10003, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1354),
             name: Some("rust_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42865,22 +43087,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10163, 10321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1355),
             name: Some("rust_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42903,22 +43125,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10323, 10496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1356),
             name: Some("rust_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42941,22 +43163,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10498, 10646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1357),
             name: Some("rust_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -42981,22 +43203,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10648, 10837),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1358),
             name: Some("rust_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43019,22 +43241,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 10839, 11003),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1359),
             name: Some("rust_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43059,7 +43281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -43078,7 +43300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -43099,22 +43321,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11005, 11307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1360),
             name: Some("rust_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43141,7 +43363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -43160,7 +43382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -43181,22 +43403,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11309, 11650),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1361),
             name: Some("rust_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43223,7 +43445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -43242,7 +43464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -43263,22 +43485,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11652, 11997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1362),
             name: Some("rust_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43304,7 +43526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -43324,22 +43546,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 11999, 12275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1363),
             name: Some("rust_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43366,7 +43588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -43385,7 +43607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -43406,22 +43628,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12277, 12594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1364),
             name: Some("rust_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43446,7 +43668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -43465,7 +43687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -43486,22 +43708,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12596, 12916),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1365),
             name: Some("rust_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43526,7 +43748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -43545,7 +43767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -43564,7 +43786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -43585,22 +43807,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 12918, 13331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1366),
             name: Some("rust_element_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43624,7 +43846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2009),
+                                    constructor: DeclarationId(2032),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -43644,22 +43866,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13333, 13574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1367),
             name: Some("rust_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43684,7 +43906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -43703,7 +43925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -43724,22 +43946,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13576, 13896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1368),
             name: Some("rust_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43763,7 +43985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2009),
+                                    constructor: DeclarationId(2032),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -43783,22 +44005,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 13898, 14143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1369),
             name: Some("rust_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43822,7 +44044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -43842,22 +44064,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14145, 14390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1370),
             name: Some("rust_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43881,7 +44103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -43901,22 +44123,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14392, 14655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1371),
             name: Some("rust_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -43941,7 +44163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -43962,7 +44184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -43983,22 +44205,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14657, 14994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1372),
             name: Some("rust_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44021,22 +44243,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 14996, 15151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1373),
             name: Some("rust_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44059,22 +44281,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15153, 15305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1374),
             name: Some("rust_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44097,22 +44319,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15307, 15459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1375),
             name: Some("rust_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44135,22 +44357,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15461, 15628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1376),
             name: Some("rust_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44175,7 +44397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -44194,7 +44416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -44215,7 +44437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -44236,7 +44458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -44257,7 +44479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -44278,7 +44500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -44299,7 +44521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -44320,7 +44542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -44341,7 +44563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -44360,7 +44582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44381,22 +44603,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 15630, 16651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1377),
             name: Some("rust_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44419,22 +44641,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16653, 16814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1378),
             name: Some("rust_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44457,22 +44679,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16816, 16977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1379),
             name: Some("rust_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44495,22 +44717,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 16979, 17131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1380),
             name: Some("rust_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44533,22 +44755,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17133, 17294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1381),
             name: Some("rust_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44571,22 +44793,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17296, 17466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1382),
             name: Some("rust_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44609,22 +44831,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17468, 17632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1383),
             name: Some("rust_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44651,7 +44873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -44672,7 +44894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -44693,22 +44915,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17634, 17989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1384),
             name: Some("rust_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44733,7 +44955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -44754,7 +44976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -44773,7 +44995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -44792,7 +45014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -44813,22 +45035,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 17991, 18479),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1385),
             name: Some("rust_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44851,22 +45073,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18481, 18633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1386),
             name: Some("rust_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -44891,7 +45113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -44910,7 +45132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -44931,7 +45153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -44950,7 +45172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -44971,7 +45193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -44992,22 +45214,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 18635, 19408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1387),
             name: Some("rust_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -45032,7 +45254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45051,7 +45273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -45070,7 +45292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -45091,7 +45313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -45110,7 +45332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45131,22 +45353,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19410, 19982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1388),
             name: Some("rust_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -45171,7 +45393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45190,7 +45412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -45209,7 +45431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -45230,7 +45452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -45249,7 +45471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45270,7 +45492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -45291,22 +45513,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 19984, 20651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1389),
             name: Some("rust_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -45331,7 +45553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45350,7 +45572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -45369,7 +45591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -45388,7 +45610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -45407,7 +45629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -45428,7 +45650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -45447,7 +45669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45468,22 +45690,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 20653, 21362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1390),
             name: Some("rust_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -45508,7 +45730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -45527,7 +45749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45548,7 +45770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -45567,7 +45789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -45586,7 +45808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -45607,7 +45829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -45628,7 +45850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -45649,22 +45871,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 21364, 22124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1391),
             name: Some("rust_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -45687,22 +45909,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22126, 22274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1392),
             name: Some("rust_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -45729,7 +45951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -45748,7 +45970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -45767,7 +45989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -45788,7 +46010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2009),
+                                        constructor: DeclarationId(2032),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -45809,26 +46031,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22276, 22756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1393),
             name: Some("rust_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1022)),
+                        FieldValue::Reference(DeclarationId(1029)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45850,7 +46072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2008),
+                                    constructor: DeclarationId(2031),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "items".to_string(),
                                     ))],
@@ -45870,26 +46092,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 22969, 23229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1394),
             name: Some("rust_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1035)),
+                        FieldValue::Reference(DeclarationId(1042)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45910,26 +46132,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 23231, 23404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1395),
             name: Some("rust_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1023)),
+                        FieldValue::Reference(DeclarationId(1030)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45952,7 +46174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -45971,7 +46193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -45992,7 +46214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "refinement".to_string(),
                                         ))],
@@ -46013,26 +46235,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 23406, 23823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1396),
             name: Some("rust_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1024)),
+                        FieldValue::Reference(DeclarationId(1031)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46055,7 +46277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46074,7 +46296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -46095,26 +46317,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 23825, 24153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1390),
+            id: DeclarationId(1397),
             name: Some("rust_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1025)),
+                        FieldValue::Reference(DeclarationId(1032)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46137,7 +46359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46156,7 +46378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -46175,7 +46397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46196,26 +46418,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24155, 24576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1398),
             name: Some("rust_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1026)),
+                        FieldValue::Reference(DeclarationId(1033)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46236,26 +46458,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24578, 24760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1399),
             name: Some("rust_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1027)),
+                        FieldValue::Reference(DeclarationId(1034)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46276,26 +46498,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24762, 24935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1400),
             name: Some("rust_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1028)),
+                        FieldValue::Reference(DeclarationId(1035)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46318,7 +46540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46337,7 +46559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -46356,7 +46578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46377,26 +46599,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 24937, 25367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1401),
             name: Some("rust_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1029)),
+                        FieldValue::Reference(DeclarationId(1036)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46419,7 +46641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key".to_string(),
                                         ))],
@@ -46440,7 +46662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "key_span".to_string(),
                                         ))],
@@ -46459,7 +46681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -46478,7 +46700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46499,26 +46721,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25369, 25873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1402),
             name: Some("rust_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1030)),
+                        FieldValue::Reference(DeclarationId(1037)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46541,7 +46763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -46560,7 +46782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -46579,7 +46801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46600,26 +46822,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 25875, 26300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1403),
             name: Some("rust_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1031)),
+                        FieldValue::Reference(DeclarationId(1038)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46642,7 +46864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -46661,7 +46883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -46680,7 +46902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2008),
+                                        constructor: DeclarationId(2031),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -46701,26 +46923,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26302, 26739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1404),
             name: Some("rust_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1032)),
+                        FieldValue::Reference(DeclarationId(1039)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46741,26 +46963,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26741, 26923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1405),
             name: Some("rust_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1033)),
+                        FieldValue::Reference(DeclarationId(1040)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46781,26 +47003,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 26925, 27107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1406),
             name: Some("rust_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1034)),
+                        FieldValue::Reference(DeclarationId(1041)),
                     ),
                     (
                         "carrier".to_string(),
@@ -46821,22 +47043,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 27109, 27282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1400),
+            id: DeclarationId(1407),
             name: Some("rust_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -46855,22 +47077,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28137, 28282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1401),
+            id: DeclarationId(1408),
             name: Some("rust_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -46889,22 +47111,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28284, 28429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1402),
+            id: DeclarationId(1409),
             name: Some("rust_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -46923,22 +47145,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28431, 28576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1403),
+            id: DeclarationId(1410),
             name: Some("rust_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -46959,22 +47181,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 28578, 28736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1404),
+            id: DeclarationId(1411),
             name: Some("rust_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -46993,22 +47215,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29186, 29330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1405),
+            id: DeclarationId(1412),
             name: Some("rust_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47027,22 +47249,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29332, 29483),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1406),
+            id: DeclarationId(1413),
             name: Some("rust_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47061,22 +47283,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29485, 29636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1407),
+            id: DeclarationId(1414),
             name: Some("rust_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47095,22 +47317,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29638, 29803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1408),
+            id: DeclarationId(1415),
             name: Some("rust_string_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47129,22 +47351,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 29996, 30146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1409),
+            id: DeclarationId(1416),
             name: Some("rust_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47163,22 +47385,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30148, 30292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1410),
+            id: DeclarationId(1417),
             name: Some("rust_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47197,22 +47419,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30294, 30445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1411),
+            id: DeclarationId(1418),
             name: Some("rust_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47231,22 +47453,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30447, 30598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1412),
+            id: DeclarationId(1419),
             name: Some("rust_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47265,22 +47487,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30600, 30765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1413),
+            id: DeclarationId(1420),
             name: Some("rust_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47299,22 +47521,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30767, 30910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1414),
+            id: DeclarationId(1421),
             name: Some("rust_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47333,22 +47555,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 30912, 31056),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1415),
+            id: DeclarationId(1422),
             name: Some("rust_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47367,22 +47589,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31058, 31201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1416),
+            id: DeclarationId(1423),
             name: Some("rust_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47401,22 +47623,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31203, 31347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1417),
+            id: DeclarationId(1424),
             name: Some("rust_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47435,22 +47657,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31349, 31502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1418),
+            id: DeclarationId(1425),
             name: Some("rust_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47469,26 +47691,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 31504, 31657),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1419),
+            id: DeclarationId(1426),
             name: Some("rust_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1118)),
+                        FieldValue::Reference(DeclarationId(1125)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47504,26 +47726,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32407, 32546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1420),
+            id: DeclarationId(1427),
             name: Some("rust_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1116)),
+                        FieldValue::Reference(DeclarationId(1123)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47539,26 +47761,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32548, 32695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1421),
+            id: DeclarationId(1428),
             name: Some("rust_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1119)),
+                        FieldValue::Reference(DeclarationId(1126)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47575,22 +47797,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 32697, 32867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1422),
+            id: DeclarationId(1429),
             name: Some("rust_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47599,7 +47821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2021),
+                            constructor: DeclarationId(2044),
                             payload: vec![],
                         },
                     ),
@@ -47612,22 +47834,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34244, 34386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1423),
+            id: DeclarationId(1430),
             name: Some("rust_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47636,7 +47858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2022),
+                            constructor: DeclarationId(2045),
                             payload: vec![],
                         },
                     ),
@@ -47647,7 +47869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2012),
+                                    constructor: DeclarationId(2035),
                                     payload: vec![],
                                 },
                             ),
@@ -47661,22 +47883,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34388, 34584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1424),
+            id: DeclarationId(1431),
             name: Some("rust_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47685,7 +47907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -47697,7 +47919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -47707,7 +47929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -47722,22 +47944,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34586, 34807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1425),
+            id: DeclarationId(1432),
             name: Some("rust_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47746,7 +47968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![],
                         },
                     ),
@@ -47758,7 +47980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -47768,7 +47990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -47783,22 +48005,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 34809, 35036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1426),
+            id: DeclarationId(1433),
             name: Some("rust_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47807,7 +48029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2025),
+                            constructor: DeclarationId(2048),
                             payload: vec![],
                         },
                     ),
@@ -47818,7 +48040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2011),
+                                    constructor: DeclarationId(2034),
                                     payload: vec![],
                                 },
                             ),
@@ -47832,22 +48054,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35038, 35225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1427),
+            id: DeclarationId(1434),
             name: Some("rust_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47865,22 +48087,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35227, 35370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1428),
+            id: DeclarationId(1435),
             name: Some("rust_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47900,26 +48122,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35649, 35820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1429),
+            id: DeclarationId(1436),
             name: Some("rust_lookup_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1017)),
+                        FieldValue::Reference(DeclarationId(1024)),
                     ),
                     (
                         "carrier".to_string(),
@@ -47933,22 +48155,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35822, 35972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1430),
+            id: DeclarationId(1437),
             name: Some("rust_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47968,22 +48190,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 35974, 36124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1431),
+            id: DeclarationId(1438),
             name: Some("rust_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -47992,7 +48214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2026),
+                            constructor: DeclarationId(2049),
                             payload: vec![],
                         },
                     ),
@@ -48003,7 +48225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(2011),
+                                    constructor: DeclarationId(2034),
                                     payload: vec![],
                                 },
                             ),
@@ -48017,22 +48239,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 36126, 36318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1432),
+            id: DeclarationId(1439),
             name: Some("rust_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -48041,7 +48263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2027),
+                            constructor: DeclarationId(2050),
                             payload: vec![],
                         },
                     ),
@@ -48053,7 +48275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -48063,7 +48285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2012),
+                                        constructor: DeclarationId(2035),
                                         payload: vec![],
                                     },
                                 ),
@@ -48073,7 +48295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -48088,22 +48310,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 36320, 36581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1433),
+            id: DeclarationId(1440),
             name: Some("rust_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -48112,7 +48334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2028),
+                            constructor: DeclarationId(2051),
                             payload: vec![],
                         },
                     ),
@@ -48124,7 +48346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -48134,7 +48356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -48149,22 +48371,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 36583, 36801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1434),
+            id: DeclarationId(1441),
             name: Some("rust_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -48173,7 +48395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2029),
+                            constructor: DeclarationId(2052),
                             payload: vec![],
                         },
                     ),
@@ -48185,7 +48407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -48195,7 +48417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -48210,22 +48432,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 36803, 37030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1435),
+            id: DeclarationId(1442),
             name: Some("rust_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -48234,7 +48456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2030),
+                            constructor: DeclarationId(2053),
                             payload: vec![],
                         },
                     ),
@@ -48246,7 +48468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -48256,7 +48478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(2011),
+                                        constructor: DeclarationId(2034),
                                         payload: vec![],
                                     },
                                 ),
@@ -48271,22 +48493,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37032, 37265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1436),
+            id: DeclarationId(1443),
             name: Some("rust_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -48295,17 +48517,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2032),
+                            constructor: DeclarationId(2055),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1543)),
+                        FieldValue::Reference(DeclarationId(1550)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1545)),
+                        FieldValue::Reference(DeclarationId(1552)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -48337,15 +48559,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37493, 37797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1437),
+            id: DeclarationId(1444),
             name: Some("rust_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(927),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(927)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48369,15 +48591,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37799, 37937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1438),
+            id: DeclarationId(1445),
             name: Some("rust_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(935),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(935)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48403,15 +48625,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 37939, 38092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1439),
+            id: DeclarationId(1446),
             name: Some("rust_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(937),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(937)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48448,15 +48670,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38094, 38284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1440),
+            id: DeclarationId(1447),
             name: Some("rust_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(931),
+                template: DeclarationId(938),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(931)),
+            meta_tag: Some(DeclarationId(938)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48480,15 +48702,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38286, 38398),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1441),
+            id: DeclarationId(1448),
             name: Some("rust_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(939),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(939)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48502,15 +48724,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38400, 38460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1442),
+            id: DeclarationId(1449),
             name: Some("rust_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(933),
+                template: DeclarationId(940),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(933)),
+            meta_tag: Some(DeclarationId(940)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48548,15 +48770,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38462, 38740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1443),
+            id: DeclarationId(1450),
             name: Some("rust_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(934),
+                template: DeclarationId(941),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(934)),
+            meta_tag: Some(DeclarationId(941)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48570,15 +48792,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38742, 38830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1444),
+            id: DeclarationId(1451),
             name: Some("rust_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(935),
+                template: DeclarationId(942),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(935)),
+            meta_tag: Some(DeclarationId(942)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48616,15 +48838,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 38832, 39134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1445),
+            id: DeclarationId(1452),
             name: Some("rust_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(936),
+                template: DeclarationId(943),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(936)),
+            meta_tag: Some(DeclarationId(943)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48648,15 +48870,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39136, 39349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1446),
+            id: DeclarationId(1453),
             name: Some("rust_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(937),
+                template: DeclarationId(944),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(937)),
+            meta_tag: Some(DeclarationId(944)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48706,15 +48928,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39351, 39686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1454),
             name: Some("rust_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48736,7 +48958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -48750,7 +48972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -48761,15 +48983,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 39688, 40058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1455),
             name: Some("rust_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48790,7 +49012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -48803,7 +49025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -48814,15 +49036,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40060, 40354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1449),
+            id: DeclarationId(1456),
             name: Some("rust_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48841,7 +49063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -48854,7 +49076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -48865,15 +49087,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40525, 40820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1450),
+            id: DeclarationId(1457),
             name: Some("rust_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48894,7 +49116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -48907,7 +49129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -48918,15 +49140,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 40822, 41142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1451),
+            id: DeclarationId(1458),
             name: Some("rust_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48947,7 +49169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2039),
+                            constructor: DeclarationId(2062),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().map({body}).collect::<Vec<_>>()".to_string(),
                             ))],
@@ -48960,7 +49182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2038),
+                            constructor: DeclarationId(2061),
                             payload: vec![],
                         },
                     ),
@@ -48970,17 +49192,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/rust.dag", 41144, 41472),
         });
-        declarations.push(Declaration { id: DeclarationId(1452), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(938), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(938)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1447))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1448))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1449))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1450))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1058))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1061))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1059))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1060))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1451))), ("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", 41474, 42350) });
+        declarations.push(Declaration { id: DeclarationId(1459), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(945), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(945)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1454))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1455))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1456))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1457))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1065))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1068))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1066))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1067))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1458))), ("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", 41474, 42350) });
         declarations.push(Declaration {
-            id: DeclarationId(1453),
+            id: DeclarationId(1460),
             name: Some("rust_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(939),
+                template: DeclarationId(946),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(939)),
+            meta_tag: Some(DeclarationId(946)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49016,15 +49238,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42352, 42624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1454),
+            id: DeclarationId(1461),
             name: Some("rust_rendering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(940),
+                template: DeclarationId(947),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(940)),
+            meta_tag: Some(DeclarationId(947)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49032,14 +49254,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2033),
+                            constructor: DeclarationId(2056),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2035),
+                            constructor: DeclarationId(2058),
                             payload: vec![],
                         },
                     ),
@@ -49050,66 +49272,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42626, 42707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1455),
+            id: DeclarationId(1462),
             name: Some("rust_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(943),
+                template: DeclarationId(950),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(943)),
+            meta_tag: Some(DeclarationId(950)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1437)),
+                        FieldValue::Reference(DeclarationId(1444)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1438)),
+                        FieldValue::Reference(DeclarationId(1445)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1439)),
+                        FieldValue::Reference(DeclarationId(1446)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1441)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1442)),
+                        FieldValue::Reference(DeclarationId(1449)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1443)),
+                        FieldValue::Reference(DeclarationId(1450)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1444)),
+                        FieldValue::Reference(DeclarationId(1451)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1452)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1446)),
+                        FieldValue::Reference(DeclarationId(1453)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1452)),
+                        FieldValue::Reference(DeclarationId(1459)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1453)),
+                        FieldValue::Reference(DeclarationId(1460)),
                     ),
                 ],
             }),
@@ -49118,7 +49340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 42709, 43154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1456),
+            id: DeclarationId(1463),
             name: Some("rust_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(841),
@@ -49154,7 +49376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44578, 44717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1457),
+            id: DeclarationId(1464),
             name: Some("rust_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(832),
@@ -49170,55 +49392,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1881),
+                            constructor: DeclarationId(1888),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1884),
+                            constructor: DeclarationId(1891),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1888),
+                            constructor: DeclarationId(1895),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1890),
+                            constructor: DeclarationId(1897),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1893),
+                            constructor: DeclarationId(1900),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1896),
+                            constructor: DeclarationId(1903),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1899),
+                            constructor: DeclarationId(1906),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1456)),
+                        FieldValue::Reference(DeclarationId(1463)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -49250,7 +49472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1902),
+                                    constructor: DeclarationId(1909),
                                     payload: vec![],
                                 },
                             ),
@@ -49263,7 +49485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 44719, 45332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1458),
+            id: DeclarationId(1465),
             name: Some("rust_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(833),
@@ -49278,11 +49500,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1457)),
+                        FieldValue::Reference(DeclarationId(1464)),
                     ),
                 ],
             }),
@@ -49291,7 +49513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 45334, 45464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1459),
+            id: DeclarationId(1466),
             name: Some("rust_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -49315,7 +49537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46566, 46669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1460),
+            id: DeclarationId(1467),
             name: Some("rust_node_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -49339,7 +49561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46671, 46774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1461),
+            id: DeclarationId(1468),
             name: Some("rust_resolve_producer_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -49363,7 +49585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46776, 46903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1462),
+            id: DeclarationId(1469),
             name: Some("port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -49382,11 +49604,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1459)),
+                        FieldValue::Reference(DeclarationId(1466)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                 ],
             }),
@@ -49395,7 +49617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 46905, 47036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1463),
+            id: DeclarationId(1470),
             name: Some("node_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -49414,11 +49636,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1460)),
+                        FieldValue::Reference(DeclarationId(1467)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                 ],
             }),
@@ -49427,7 +49649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 47038, 47169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1464),
+            id: DeclarationId(1471),
             name: Some("resolve_producer_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -49446,11 +49668,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1461)),
+                        FieldValue::Reference(DeclarationId(1468)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                 ],
             }),
@@ -49459,7 +49681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 47171, 47338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1465),
+            id: DeclarationId(1472),
             name: Some("rust_lane2_workflow_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -49483,7 +49705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 47849, 47978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1466),
+            id: DeclarationId(1473),
             name: Some("lane2_workflow_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -49502,11 +49724,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1465)),
+                        FieldValue::Reference(DeclarationId(1472)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                 ],
             }),
@@ -49515,7 +49737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 47980, 48147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1467),
+            id: DeclarationId(1474),
             name: Some("rust_workflow_root_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -49539,7 +49761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 48842, 48956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1468),
+            id: DeclarationId(1475),
             name: Some("workflow_root_port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -49558,11 +49780,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1467)),
+                        FieldValue::Reference(DeclarationId(1474)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                 ],
             }),
@@ -49571,22 +49793,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 48958, 49131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1469),
+            id: DeclarationId(1476),
             name: Some("rust_workflow_root".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "target".to_string(),
@@ -49609,7 +49831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 49543, 49704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1470),
+            id: DeclarationId(1477),
             name: Some("rust_declaration_by_id_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -49633,7 +49855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50031, 50154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1471),
+            id: DeclarationId(1478),
             name: Some("declaration_by_id_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -49652,11 +49874,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1470)),
+                        FieldValue::Reference(DeclarationId(1477)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                 ],
             }),
@@ -49665,7 +49887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/spec/rust.dag", 50156, 50326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1472),
+            id: DeclarationId(1479),
             name: Some("CompilerHostRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49684,21 +49906,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1473),
+            id: DeclarationId(1480),
             name: Some("PipelineSnapshotKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2339),
+                        ty: DeclarationId(2362),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2340),
+                        ty: DeclarationId(2363),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2341),
+                        ty: DeclarationId(2364),
                     },
                 ],
             },
@@ -49713,21 +49935,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1474),
+            id: DeclarationId(1481),
             name: Some("PipelineStageBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stage".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "snapshot".to_string(),
-                        ty: DeclarationId(1473),
+                        ty: DeclarationId(1480),
                     },
                 ],
             },
@@ -49742,7 +49964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1475),
+            id: DeclarationId(1482),
             name: Some("parse_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49752,7 +49974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1472)),
+            meta_tag: Some(DeclarationId(1479)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49766,7 +49988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1476),
+            id: DeclarationId(1483),
             name: Some("lower_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49776,7 +49998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1472)),
+            meta_tag: Some(DeclarationId(1479)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49790,7 +50012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1477),
+            id: DeclarationId(1484),
             name: Some("infer_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49800,7 +50022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1472)),
+            meta_tag: Some(DeclarationId(1479)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49814,7 +50036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1478),
+            id: DeclarationId(1485),
             name: Some("compute_ownership_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49824,7 +50046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1472)),
+            meta_tag: Some(DeclarationId(1479)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49840,7 +50062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1479),
+            id: DeclarationId(1486),
             name: Some("emit_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49850,7 +50072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1472)),
+            meta_tag: Some(DeclarationId(1479)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49864,7 +50086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1480),
+            id: DeclarationId(1487),
             name: Some("lens_complexity_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49874,7 +50096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1472)),
+            meta_tag: Some(DeclarationId(1479)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -49890,31 +50112,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1481),
+            id: DeclarationId(1488),
             name: Some("parse_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1474),
+                template: DeclarationId(1481),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1474)),
+            meta_tag: Some(DeclarationId(1481)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1487)),
+                        FieldValue::Reference(DeclarationId(1494)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1475)),
+                        FieldValue::Reference(DeclarationId(1482)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2339),
+                            constructor: DeclarationId(2362),
                             payload: vec![],
                         },
                     ),
@@ -49925,31 +50147,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1482),
+            id: DeclarationId(1489),
             name: Some("lower_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1474),
+                template: DeclarationId(1481),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1474)),
+            meta_tag: Some(DeclarationId(1481)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1488)),
+                        FieldValue::Reference(DeclarationId(1495)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1476)),
+                        FieldValue::Reference(DeclarationId(1483)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2340),
+                            constructor: DeclarationId(2363),
                             payload: vec![],
                         },
                     ),
@@ -49960,31 +50182,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1483),
+            id: DeclarationId(1490),
             name: Some("infer_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1474),
+                template: DeclarationId(1481),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1474)),
+            meta_tag: Some(DeclarationId(1481)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1489)),
+                        FieldValue::Reference(DeclarationId(1496)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1477)),
+                        FieldValue::Reference(DeclarationId(1484)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2340),
+                            constructor: DeclarationId(2363),
                             payload: vec![],
                         },
                     ),
@@ -49995,31 +50217,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1484),
+            id: DeclarationId(1491),
             name: Some("compute_ownership_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1474),
+                template: DeclarationId(1481),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1474)),
+            meta_tag: Some(DeclarationId(1481)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1490)),
+                        FieldValue::Reference(DeclarationId(1497)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1478)),
+                        FieldValue::Reference(DeclarationId(1485)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2340),
+                            constructor: DeclarationId(2363),
                             payload: vec![],
                         },
                     ),
@@ -50030,31 +50252,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1485),
+            id: DeclarationId(1492),
             name: Some("lens_complexity_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1474),
+                template: DeclarationId(1481),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1474)),
+            meta_tag: Some(DeclarationId(1481)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1491)),
+                        FieldValue::Reference(DeclarationId(1498)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1480)),
+                        FieldValue::Reference(DeclarationId(1487)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2340),
+                            constructor: DeclarationId(2363),
                             payload: vec![],
                         },
                     ),
@@ -50065,31 +50287,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1486),
+            id: DeclarationId(1493),
             name: Some("emit_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1474),
+                template: DeclarationId(1481),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1474)),
+            meta_tag: Some(DeclarationId(1481)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1492)),
+                        FieldValue::Reference(DeclarationId(1499)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1479)),
+                        FieldValue::Reference(DeclarationId(1486)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2341),
+                            constructor: DeclarationId(2364),
                             payload: vec![],
                         },
                     ),
@@ -50100,12 +50322,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1487),
+            id: DeclarationId(1494),
             name: Some("parse".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(197)],
                 output: DeclarationId(747),
-                body: ArrowBody::ExternalRealization(DeclarationId(1475)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1482)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50118,12 +50340,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1488),
+            id: DeclarationId(1495),
             name: Some("lower".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747)],
                 output: DeclarationId(747),
-                body: ArrowBody::ExternalRealization(DeclarationId(1476)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1483)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50136,12 +50358,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1489),
+            id: DeclarationId(1496),
             name: Some("infer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747)],
                 output: DeclarationId(747),
-                body: ArrowBody::ExternalRealization(DeclarationId(1477)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1484)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50154,12 +50376,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1490),
+            id: DeclarationId(1497),
             name: Some("compute_ownership".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747)],
                 output: DeclarationId(747),
-                body: ArrowBody::ExternalRealization(DeclarationId(1478)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1485)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50172,12 +50394,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1491),
+            id: DeclarationId(1498),
             name: Some("lens_complexity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747)],
                 output: DeclarationId(747),
-                body: ArrowBody::ExternalRealization(DeclarationId(1480)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1487)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50190,17 +50412,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1492),
+            id: DeclarationId(1499),
             name: Some("emit".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
                     DeclarationId(747),
                     DeclarationId(747),
                     DeclarationId(747),
-                    DeclarationId(943),
+                    DeclarationId(950),
                 ],
                 output: DeclarationId(197),
-                body: ArrowBody::ExternalRealization(DeclarationId(1479)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1486)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -50213,10 +50435,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1493),
+            id: DeclarationId(1500),
             name: Some("compile".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(943)],
+                inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(950)],
                 output: DeclarationId(197),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/pipeline.dag",
@@ -50235,11 +50457,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1494),
+            id: DeclarationId(1501),
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(2342),
+                output: DeclarationId(2365),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -50257,7 +50479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1502),
             name: Some("symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(725)],
@@ -50275,7 +50497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1503),
             name: Some("algebra_field_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(725)],
@@ -50293,7 +50515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1504),
             name: Some("LensRegistryEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50322,15 +50544,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 1950, 2045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1505),
             name: Some("lens_cost_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1497),
+                template: DeclarationId(1504),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1497)),
+            meta_tag: Some(DeclarationId(1504)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50358,15 +50580,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1506),
             name: Some("lens_cost_symbolic_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1497),
+                template: DeclarationId(1504),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1497)),
+            meta_tag: Some(DeclarationId(1504)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50394,15 +50616,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2216, 2404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1507),
             name: Some("lens_effect_enumeration_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1497),
+                template: DeclarationId(1504),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1497)),
+            meta_tag: Some(DeclarationId(1504)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50430,15 +50652,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2406, 2623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1508),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1497),
+                template: DeclarationId(1504),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1497)),
+            meta_tag: Some(DeclarationId(1504)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50466,15 +50688,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2625, 2810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1509),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1497),
+                template: DeclarationId(1504),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1497)),
+            meta_tag: Some(DeclarationId(1504)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50505,15 +50727,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2812, 3041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1510),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1497),
+                template: DeclarationId(1504),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1497)),
+            meta_tag: Some(DeclarationId(1504)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50541,15 +50763,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3043, 3256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1511),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1497),
+                template: DeclarationId(1504),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1497)),
+            meta_tag: Some(DeclarationId(1504)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50577,15 +50799,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3883, 4075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1512),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1497),
+                template: DeclarationId(1504),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1497)),
+            meta_tag: Some(DeclarationId(1504)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50613,15 +50835,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4077, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1513),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1497),
+                template: DeclarationId(1504),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1497)),
+            meta_tag: Some(DeclarationId(1504)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -50649,17 +50871,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4527, 4719),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1514),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2343),
+                        ty: DeclarationId(2366),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2344),
+                        ty: DeclarationId(2367),
                     },
                 ],
             },
@@ -50674,17 +50896,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5528, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1508),
+            id: DeclarationId(1515),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2345),
+                        ty: DeclarationId(2368),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2346),
+                        ty: DeclarationId(2369),
                     },
                 ],
             },
@@ -50699,37 +50921,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5592, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1516),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2347),
+                        ty: DeclarationId(2370),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2348),
+                        ty: DeclarationId(2371),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2349),
+                        ty: DeclarationId(2372),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2350),
+                        ty: DeclarationId(2373),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2351),
+                        ty: DeclarationId(2374),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2352),
+                        ty: DeclarationId(2375),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2353),
+                        ty: DeclarationId(2376),
                     },
                 ],
             },
@@ -50744,21 +50966,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7234, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1517),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2354),
+                        ty: DeclarationId(2377),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2355),
+                        ty: DeclarationId(2378),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2356),
+                        ty: DeclarationId(2379),
                     },
                 ],
             },
@@ -50773,17 +50995,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8093, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1518),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2357),
+                        ty: DeclarationId(2380),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2358),
+                        ty: DeclarationId(2381),
                     },
                 ],
             },
@@ -50798,94 +51020,94 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8914, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1519),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1511),
+                    value: DeclarationId(1518),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2359)),
+            meta_tag: Some(DeclarationId(2382)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2357),
+                    constructor: DeclarationId(2380),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2366),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2371),
                             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(2354),
+                            constructor: DeclarationId(2377),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2357),
+                    constructor: DeclarationId(2380),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2366),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2349),
+                            constructor: DeclarationId(2372),
                             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(2354),
+                            constructor: DeclarationId(2377),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2357),
+                    constructor: DeclarationId(2380),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2366),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2350),
+                            constructor: DeclarationId(2373),
                             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(2354),
+                            constructor: DeclarationId(2377),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2357),
+                    constructor: DeclarationId(2380),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2366),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2351),
+                            constructor: DeclarationId(2374),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -50894,21 +51116,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2377),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2357),
+                    constructor: DeclarationId(2380),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2343),
+                            constructor: DeclarationId(2366),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2352),
+                            constructor: DeclarationId(2375),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -50919,84 +51141,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2377),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2357),
+                    constructor: DeclarationId(2380),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2367),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2348),
+                            constructor: DeclarationId(2371),
                             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(2354),
+                            constructor: DeclarationId(2377),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2357),
+                    constructor: DeclarationId(2380),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2367),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2349),
+                            constructor: DeclarationId(2372),
                             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(2354),
+                            constructor: DeclarationId(2377),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2357),
+                    constructor: DeclarationId(2380),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2367),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2350),
+                            constructor: DeclarationId(2373),
                             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(2354),
+                            constructor: DeclarationId(2377),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2357),
+                    constructor: DeclarationId(2380),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2344),
+                            constructor: DeclarationId(2367),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2351),
+                            constructor: DeclarationId(2374),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -51005,36 +51227,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2354),
+                            constructor: DeclarationId(2377),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2358),
+                    constructor: DeclarationId(2381),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2345),
+                            constructor: DeclarationId(2368),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2347),
+                            constructor: DeclarationId(2370),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2358),
+                    constructor: DeclarationId(2381),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2346),
+                            constructor: DeclarationId(2369),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2353),
+                            constructor: DeclarationId(2376),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -51046,7 +51268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9996, 13318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1513),
+            id: DeclarationId(1520),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51066,7 +51288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1514),
+            id: DeclarationId(1521),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51086,7 +51308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1522),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51106,7 +51328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1523),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51126,7 +51348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1517),
+            id: DeclarationId(1524),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51146,7 +51368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1525),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(616), DeclarationId(615)],
@@ -51164,7 +51386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1526),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51184,7 +51406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1527),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(618), DeclarationId(619)],
@@ -51202,7 +51424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1528),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51222,7 +51444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1529),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51242,7 +51464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1523),
+            id: DeclarationId(1530),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51262,7 +51484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1531),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51282,7 +51504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1532),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(623)],
@@ -51300,7 +51522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1526),
+            id: DeclarationId(1533),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51320,7 +51542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1534),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51340,7 +51562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1528),
+            id: DeclarationId(1535),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(626)],
@@ -51358,7 +51580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1536),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51378,7 +51600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1537),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51398,7 +51620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1538),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51418,11 +51640,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1539),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(628)],
-                output: DeclarationId(1531),
+                output: DeclarationId(1538),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -51436,7 +51658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1540),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51456,7 +51678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1541),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51476,7 +51698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1542),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51496,7 +51718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1543),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51516,7 +51738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1537),
+            id: DeclarationId(1544),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(634),
@@ -51536,13 +51758,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1545),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1537),
+                    value: DeclarationId(1544),
                 }],
             },
             type_params: vec![],
@@ -51556,7 +51778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1546),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51576,7 +51798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1540),
+            id: DeclarationId(1547),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(634),
@@ -51596,13 +51818,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1548),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1540),
+                    value: DeclarationId(1547),
                 }],
             },
             type_params: vec![],
@@ -51616,7 +51838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1549),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51636,7 +51858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1550),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51650,7 +51872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1551),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51670,7 +51892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1552),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51680,7 +51902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1544),
+                        ty: DeclarationId(1551),
                     },
                 ],
             },
@@ -51695,7 +51917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1553),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51715,7 +51937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1554),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51735,7 +51957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1555),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51754,7 +51976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1556),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(732),
@@ -51774,7 +51996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1557),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(634),
@@ -51794,7 +52016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1551),
+            id: DeclarationId(1558),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(732),
@@ -51814,11 +52036,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1559),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1551),
+                    DeclarationId(1558),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -51833,7 +52055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1560),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51853,7 +52075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1561),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(732),
@@ -51873,11 +52095,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1555),
+            id: DeclarationId(1562),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1554),
+                    DeclarationId(1561),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -51892,7 +52114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1563),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51912,7 +52134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1564),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51931,7 +52153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1565),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51950,7 +52172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1559),
+            id: DeclarationId(1566),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51969,7 +52191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1567),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51989,7 +52211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 37237, 37258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1568),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52009,7 +52231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 37264, 37295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1562),
+            id: DeclarationId(1569),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52028,7 +52250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1570),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52047,7 +52269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1571),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52067,7 +52289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1572),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52087,12 +52309,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1573),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1565),
+                    ty: DeclarationId(1572),
                 }],
             },
             type_params: vec![],
@@ -52106,7 +52328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1567),
+            id: DeclarationId(1574),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52131,7 +52353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1568),
+            id: DeclarationId(1575),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52150,7 +52372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1569),
+            id: DeclarationId(1576),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52179,7 +52401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1577),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52193,7 +52415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1578),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52212,7 +52434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1572),
+            id: DeclarationId(1579),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52231,7 +52453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1580),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52250,7 +52472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1574),
+            id: DeclarationId(1581),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52264,7 +52486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1582),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52283,7 +52505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1576),
+            id: DeclarationId(1583),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52302,7 +52524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1584),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52316,7 +52538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1578),
+            id: DeclarationId(1585),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52335,7 +52557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1586),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52354,7 +52576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1580),
+            id: DeclarationId(1587),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52373,7 +52595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1588),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52393,12 +52615,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1589),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1581),
+                    ty: DeclarationId(1588),
                 }],
             },
             type_params: vec![],
@@ -52412,7 +52634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1583),
+            id: DeclarationId(1590),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52426,7 +52648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1591),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52440,7 +52662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1592),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52459,7 +52681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1586),
+            id: DeclarationId(1593),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52478,7 +52700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1587),
+            id: DeclarationId(1594),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52503,7 +52725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1588),
+            id: DeclarationId(1595),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52540,7 +52762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1589),
+            id: DeclarationId(1596),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52554,7 +52776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1590),
+            id: DeclarationId(1597),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(732),
@@ -52574,12 +52796,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1598),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1590),
+                    ty: DeclarationId(1597),
                 }],
             },
             type_params: vec![],
@@ -52593,7 +52815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1599),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52613,12 +52835,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1593),
+            id: DeclarationId(1600),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1592),
+                    ty: DeclarationId(1599),
                 }],
             },
             type_params: vec![],
@@ -52632,7 +52854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1601),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -52652,12 +52874,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1602),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1594),
+                    ty: DeclarationId(1601),
                 }],
             },
             type_params: vec![],
@@ -52671,7 +52893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1603),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52690,7 +52912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1597),
+            id: DeclarationId(1604),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -52710,12 +52932,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1598),
+            id: DeclarationId(1605),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1597),
+                    ty: DeclarationId(1604),
                 }],
             },
             type_params: vec![],
@@ -52729,7 +52951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1599),
+            id: DeclarationId(1606),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52748,7 +52970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1600),
+            id: DeclarationId(1607),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52767,7 +52989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1601),
+            id: DeclarationId(1608),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52781,7 +53003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1602),
+            id: DeclarationId(1609),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52795,7 +53017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1603),
+            id: DeclarationId(1610),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52809,7 +53031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1604),
+            id: DeclarationId(1611),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52823,7 +53045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1605),
+            id: DeclarationId(1612),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52837,7 +53059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1606),
+            id: DeclarationId(1613),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52856,7 +53078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1607),
+            id: DeclarationId(1614),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52875,7 +53097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1608),
+            id: DeclarationId(1615),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52889,7 +53111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33114, 33120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1609),
+            id: DeclarationId(1616),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52908,7 +53130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33125, 33162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1610),
+            id: DeclarationId(1617),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52927,7 +53149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33167, 33204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1611),
+            id: DeclarationId(1618),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52941,7 +53163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33678, 33697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1612),
+            id: DeclarationId(1619),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52960,7 +53182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/effects.dag", 33702, 33751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1613),
+            id: DeclarationId(1620),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52979,7 +53201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19513, 19521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1614),
+            id: DeclarationId(1621),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52998,7 +53220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19570, 19579),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1615),
+            id: DeclarationId(1622),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53017,7 +53239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 19645, 19654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1616),
+            id: DeclarationId(1623),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53036,7 +53258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 20031, 20043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1617),
+            id: DeclarationId(1624),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53055,12 +53277,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 20352, 20367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1618),
+            id: DeclarationId(1625),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(644),
                 }],
             },
@@ -53075,12 +53297,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24351, 24372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1619),
+            id: DeclarationId(1626),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(644),
                 }],
             },
@@ -53095,7 +53317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 24436, 24457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1620),
+            id: DeclarationId(1627),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53109,7 +53331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1621),
+            id: DeclarationId(1628),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53128,7 +53350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 494, 513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1629),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53142,7 +53364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1630),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53161,7 +53383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1631),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53180,7 +53402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 791, 802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1632),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53199,7 +53421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 807, 820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1633),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53218,7 +53440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 825, 842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1634),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53237,7 +53459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 2873, 2893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1635),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53256,7 +53478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 2898, 2926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1636),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53275,7 +53497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 2931, 2965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1637),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53294,7 +53516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 2970, 2999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1638),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53313,7 +53535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3004, 3021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1639),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53327,7 +53549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3645, 3652),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1640),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53346,7 +53568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 3657, 3707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1641),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53365,7 +53587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5271, 5295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1642),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53379,7 +53601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5320, 5329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1643),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53398,7 +53620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5334, 5370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1644),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53423,7 +53645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5682, 5732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1645),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53437,7 +53659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 5737, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1646),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(706),
@@ -53457,12 +53679,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6322, 6335),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1647),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1639),
+                    ty: DeclarationId(1646),
                 }],
             },
             type_params: vec![],
@@ -53476,7 +53698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6310, 6336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1648),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53490,7 +53712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6341, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1649),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53509,7 +53731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6609, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1650),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53523,7 +53745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6624, 6633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1651),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53537,7 +53759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 6638, 6647),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1652),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53556,7 +53778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7074, 7094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1653),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53575,7 +53797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7099, 7123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1654),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53595,12 +53817,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7135, 7151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1655),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1647),
+                    ty: DeclarationId(1654),
                 }],
             },
             type_params: vec![],
@@ -53614,7 +53836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7128, 7152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1656),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53634,12 +53856,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7162, 7178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1657),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1649),
+                    ty: DeclarationId(1656),
                 }],
             },
             type_params: vec![],
@@ -53653,7 +53875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7157, 7179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1658),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53673,12 +53895,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7188, 7204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1659),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1651),
+                    ty: DeclarationId(1658),
                 }],
             },
             type_params: vec![],
@@ -53692,7 +53914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7184, 7205),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1660),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53712,7 +53934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7268, 7284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1661),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53722,7 +53944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1653),
+                        ty: DeclarationId(1660),
                     },
                 ],
             },
@@ -53737,7 +53959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7210, 7290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1655),
+            id: DeclarationId(1662),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53756,7 +53978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7449, 7478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1663),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53776,12 +53998,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7513, 7529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1664),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1656),
+                    ty: DeclarationId(1663),
                 }],
             },
             type_params: vec![],
@@ -53795,7 +54017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7483, 7531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1665),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53815,12 +54037,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7549, 7565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1666),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1658),
+                    ty: DeclarationId(1665),
                 }],
             },
             type_params: vec![],
@@ -53834,7 +54056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 7536, 7566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1660),
+            id: DeclarationId(1667),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53853,7 +54075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8820, 8843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1668),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53872,7 +54094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8848, 8882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1669),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53886,7 +54108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8887, 8894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1670),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53900,7 +54122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8899, 8905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1671),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53919,7 +54141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 8910, 8930),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1672),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53938,7 +54160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9159, 9176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1673),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53958,12 +54180,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9198, 9213),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1674),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1666),
+                    ty: DeclarationId(1673),
                 }],
             },
             type_params: vec![],
@@ -53977,7 +54199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9181, 9215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1675),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53997,12 +54219,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9237, 9252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1676),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1668),
+                    ty: DeclarationId(1675),
                 }],
             },
             type_params: vec![],
@@ -54016,7 +54238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9220, 9254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1677),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54036,13 +54258,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9281, 9300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1678),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1670),
+                        ty: DeclarationId(1677),
                     },
                     Field {
                         label: "output".to_string(),
@@ -54065,7 +54287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9259, 9356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1679),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54090,7 +54312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9361, 9439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1680),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54110,7 +54332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9507, 9529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1681),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54120,7 +54342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1673),
+                        ty: DeclarationId(1680),
                     },
                 ],
             },
@@ -54135,7 +54357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9444, 9535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1682),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54154,7 +54376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9584, 9591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1683),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54174,7 +54396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9636, 9655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1684),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54194,7 +54416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9674, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1685),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54213,7 +54435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9709, 9723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1686),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54232,7 +54454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9736, 9750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1687),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54251,7 +54473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9775),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1688),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54270,7 +54492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 9795, 9810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1689),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54290,7 +54512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 10933, 10952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1683),
+            id: DeclarationId(1690),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54304,7 +54526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11233, 11236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1691),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54318,7 +54540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11241, 11244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1692),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54332,7 +54554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11249, 11252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1686),
+            id: DeclarationId(1693),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54346,7 +54568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11257, 11260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1694),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54360,7 +54582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11384, 11386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1695),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54374,7 +54596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11391, 11393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1696),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54388,7 +54610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11398, 11400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1690),
+            id: DeclarationId(1697),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54402,7 +54624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11405, 11407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1698),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54416,7 +54638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11412, 11414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1699),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54430,7 +54652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11419, 11421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1700),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54444,7 +54666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11674, 11677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1701),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54458,7 +54680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11682, 11684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1702),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54477,7 +54699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11920, 11944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1703),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54496,7 +54718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11949, 11973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1704),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54515,7 +54737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 11978, 11996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1705),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54534,7 +54756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12183, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1706),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54553,7 +54775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12271, 12285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1707),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54563,7 +54785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "field_child".to_string(),
-                        ty: DeclarationId(1699),
+                        ty: DeclarationId(1706),
                     },
                 ],
             },
@@ -54578,7 +54800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12211, 12291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1708),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54597,7 +54819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12296, 12318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1709),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54622,7 +54844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12443, 12495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1703),
+            id: DeclarationId(1710),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54641,7 +54863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12500, 12530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1711),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54660,7 +54882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 12694, 12709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1712),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -54680,7 +54902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14685, 14716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1706),
+            id: DeclarationId(1713),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -54700,7 +54922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 14740, 14770),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1707),
+            id: DeclarationId(1714),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54719,7 +54941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15393, 15422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1715),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54744,7 +54966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15427, 15474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1716),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54763,7 +54985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15743, 15758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1717),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54783,7 +55005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 15832, 15844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
+            id: DeclarationId(1718),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54797,7 +55019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16085, 16094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1719),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54817,7 +55039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16152, 16168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1720),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54836,7 +55058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16232, 16256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1721),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54850,7 +55072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16670, 16682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1722),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54870,7 +55092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16760, 16772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1723),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54889,7 +55111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16810, 16825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1724),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54908,7 +55130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16848, 16870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1725),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54927,7 +55149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16962, 16978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1726),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54946,7 +55168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 16983, 17007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1727),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54965,7 +55187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17012, 17030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1728),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54984,7 +55206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17035, 17049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1729),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55003,7 +55225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17054, 17068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1730),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55023,7 +55245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17097, 17114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1731),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55043,7 +55265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17124, 17138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1732),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55063,7 +55285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17148, 17161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1733),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55083,7 +55305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 17174, 17187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1734),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55102,7 +55324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22393, 22411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1735),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55116,7 +55338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22416, 22422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1736),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -55136,12 +55358,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22455, 22479),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1737),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(1729),
+                    ty: DeclarationId(1736),
                 }],
             },
             type_params: vec![],
@@ -55155,12 +55377,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/substrate.dag", 22427, 22481),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1738),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(765),
                 }],
             },
@@ -55175,12 +55397,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10750, 10770),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1739),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(765),
                 }],
             },
@@ -55195,7 +55417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10834, 10854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1740),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -55215,7 +55437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 10922, 10952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1741),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55235,7 +55457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11419, 11437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1742),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -55255,7 +55477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11443, 11473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1743),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55275,7 +55497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 13970, 13988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1744),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -55295,7 +55517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18369, 18399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1745),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55315,7 +55537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18404, 18422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1746),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55335,7 +55557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18682, 18700),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1747),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55355,7 +55577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18705, 18723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55375,7 +55597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19196, 19214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1749),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55395,7 +55617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19219, 19237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1750),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55415,7 +55637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19338, 19356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1751),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55435,7 +55657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19676, 19694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1752),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55455,7 +55677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19699, 19717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1753),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55475,7 +55697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 21265, 21283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1754),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55495,7 +55717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 21536, 21554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1755),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55515,7 +55737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 22002, 22020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1756),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55535,7 +55757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24037, 24055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1757),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55555,7 +55777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24085, 24103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1758),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55575,7 +55797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24390, 24408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1759),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55595,7 +55817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24436, 24454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1760),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55615,7 +55837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24814, 24832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1761),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55635,7 +55857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24837, 24855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1762),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55649,7 +55871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4837, 4849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1763),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55663,7 +55885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4854, 4870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1764),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55677,7 +55899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 4875, 4889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1765),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55691,7 +55913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5739, 5752),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1766),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55705,7 +55927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5757, 5772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1767),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55719,7 +55941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5777, 5793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1768),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55733,7 +55955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 5798, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1769),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -55752,7 +55974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6664, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1770),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -55771,7 +55993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6700, 6710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1771),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -55790,7 +56012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 6740, 6744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1772),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55804,7 +56026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8213, 8222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1773),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55823,7 +56045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 8227, 8273),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1774),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55842,7 +56064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9314, 9331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1775),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55861,7 +56083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9336, 9360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1776),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55886,7 +56108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9365, 9427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1777),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -55906,12 +56128,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9444, 9474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1778),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1770),
+                    ty: DeclarationId(1777),
                 }],
             },
             type_params: vec![],
@@ -55925,7 +56147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9432, 9475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1779),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -55945,12 +56167,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9488, 9518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1772),
+                    ty: DeclarationId(1779),
                 }],
             },
             type_params: vec![],
@@ -55964,7 +56186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9480, 9519),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1781),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55983,7 +56205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9524, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1782),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56002,7 +56224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9550, 9569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1783),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
@@ -56022,7 +56244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 9287, 9309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1784),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -56042,7 +56264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11303, 11315),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(649)],
@@ -56060,7 +56282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(625),
@@ -56070,7 +56292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(765),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1528),
+                        parameter: DeclarationId(1535),
                         value: DeclarationId(772),
                     },
                 ],
@@ -56086,7 +56308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11296, 11343),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -56106,7 +56328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 11603, 11618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(765), DeclarationId(765)],
@@ -56124,7 +56346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(614),
@@ -56138,7 +56360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(765),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1518),
+                        parameter: DeclarationId(1525),
                         value: DeclarationId(776),
                     },
                 ],
@@ -56154,7 +56376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 14010, 14053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(766), DeclarationId(615)],
@@ -56172,7 +56394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(614),
@@ -56182,7 +56404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(766),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1518),
+                        parameter: DeclarationId(1525),
                         value: DeclarationId(797),
                     },
                     TemplateArgument {
@@ -56202,7 +56424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 16719, 16829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(766), DeclarationId(615)],
@@ -56220,7 +56442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(614),
@@ -56230,7 +56452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(766),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1518),
+                        parameter: DeclarationId(1525),
                         value: DeclarationId(797),
                     },
                     TemplateArgument {
@@ -56250,7 +56472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 16884, 16994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -56270,7 +56492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18445, 18475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -56290,7 +56512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18427, 18476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -56310,7 +56532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18755, 18762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -56330,7 +56552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 18889, 18941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -56350,7 +56572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19292, 19299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1792),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -56370,7 +56592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19270, 19300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -56390,7 +56612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19749, 19756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1794),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -56410,7 +56632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 19887, 19944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -56430,7 +56652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 21469, 21501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1796),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -56450,7 +56672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24140, 24147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -56470,7 +56692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24288, 24353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1798),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(766), DeclarationId(765)],
@@ -56488,7 +56710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1799),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(614),
@@ -56502,7 +56724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                         value: DeclarationId(765),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1518),
+                        parameter: DeclarationId(1525),
                         value: DeclarationId(797),
                     },
                 ],
@@ -56518,7 +56740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24471, 24529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1800),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -56538,7 +56760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24555, 24601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1801),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -56558,11 +56780,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24872, 24879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1802),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1754), DeclarationId(765)],
-                output: DeclarationId(1754),
+                inputs: vec![DeclarationId(1761), DeclarationId(765)],
+                output: DeclarationId(1761),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -56576,21 +56798,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1803),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(614),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(616),
-                        value: DeclarationId(1754),
+                        value: DeclarationId(1761),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(615),
                         value: DeclarationId(765),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1518),
+                        parameter: DeclarationId(1525),
                         value: DeclarationId(800),
                     },
                 ],
@@ -56606,7 +56828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/algebra.dag", 24860, 24901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1804),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -56626,7 +56848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1805),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56645,7 +56867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1806),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56664,13 +56886,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1807),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1066),
+                    value: DeclarationId(1073),
                 }],
             },
             type_params: vec![],
@@ -56684,7 +56906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1808),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -56704,12 +56926,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1809),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1808),
+                    ty: DeclarationId(1815),
                 }],
             },
             type_params: vec![],
@@ -56723,7 +56945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1810),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -56743,12 +56965,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1811),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1810),
+                    ty: DeclarationId(1817),
                 }],
             },
             type_params: vec![],
@@ -56762,7 +56984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1812),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56787,7 +57009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3042, 3107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1813),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56806,7 +57028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3112, 3136),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1814),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56825,7 +57047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3160, 3188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1815),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56844,7 +57066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3193, 3229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1816),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56863,7 +57085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3541, 3572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1817),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -56883,12 +57105,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3604, 3622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1818),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "blocks".to_string(),
-                    ty: DeclarationId(1817),
+                    ty: DeclarationId(1824),
                 }],
             },
             type_params: vec![],
@@ -56902,7 +57124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3577, 3624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1819),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56921,7 +57143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3905, 3941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1820),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56940,7 +57162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1821),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56959,7 +57181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1822),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56969,11 +57191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1820),
+                        ty: DeclarationId(1827),
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(1821),
+                        ty: DeclarationId(1828),
                     },
                 ],
             },
@@ -56988,7 +57210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3946, 4064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1823),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57007,7 +57229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4511, 4549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1824),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57036,7 +57258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4554, 4637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1825),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57050,7 +57272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4995, 5002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1826),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57064,7 +57286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5007, 5016),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1827),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57078,7 +57300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5021, 5033),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1828),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57092,7 +57314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5038, 5045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1829),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57106,7 +57328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5050, 5059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1830),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57120,7 +57342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5064, 5071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57134,7 +57356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5076, 5102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57153,7 +57375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57172,7 +57394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57186,11 +57408,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1832),
+                        ty: DeclarationId(1839),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1840),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -57213,7 +57435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5342, 5485),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57232,7 +57454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57251,7 +57473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57265,11 +57487,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1835),
+                        ty: DeclarationId(1842),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1836),
+                        ty: DeclarationId(1843),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -57292,7 +57514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5490, 5635),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57311,7 +57533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57330,7 +57552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57344,11 +57566,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1845),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1846),
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -57371,7 +57593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5640, 5793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57390,7 +57612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57404,7 +57626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1848),
                     },
                     Field {
                         label: "url".to_string(),
@@ -57423,7 +57645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5798, 5898),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57442,7 +57664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57456,7 +57678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1850),
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -57483,7 +57705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5903, 6050),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -57503,11 +57725,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6514, 6548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1845),
+                    DeclarationId(1852),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -57522,7 +57744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6514, 6549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57541,7 +57763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6801, 6805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57560,7 +57782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6837, 6841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57579,7 +57801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6873, 6880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -57599,7 +57821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7350, 7385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57618,7 +57840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7464, 7471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1852),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -57637,7 +57859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57651,7 +57873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1207, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57665,7 +57887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1225, 1231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57679,7 +57901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1236, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57693,7 +57915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1259, 1277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57707,7 +57929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1282, 1296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1858),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57721,7 +57943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1578, 1587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1859),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57746,7 +57968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1592, 1669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1860),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57771,7 +57993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1674, 1744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1861),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57785,7 +58007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1984, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1862),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57799,7 +58021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1992, 2000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57813,7 +58035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2003, 2023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57827,7 +58049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57841,7 +58063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2286, 2300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1866),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57855,7 +58077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2555, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1867),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57869,7 +58091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2570, 2580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1868),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57883,7 +58105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2898, 2910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1869),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57897,7 +58119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2913, 2929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1870),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57911,7 +58133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2932, 2943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1871),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(39),
@@ -57931,7 +58153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 3588, 3596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1872),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57945,7 +58167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1873),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57959,7 +58181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1874),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57973,7 +58195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1875),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57987,7 +58209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1876),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58001,7 +58223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1877),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58015,7 +58237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4314, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1878),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58029,7 +58251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4326, 4330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1879),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -58049,7 +58271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6578, 6599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1880),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58063,7 +58285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1881),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58077,7 +58299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1882),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58091,7 +58313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1883),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58105,7 +58327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1884),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58119,7 +58341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1885),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58133,7 +58355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58147,7 +58369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1887),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58161,7 +58383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1888),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58175,7 +58397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1889),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58189,7 +58411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1890),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58203,7 +58425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58217,7 +58439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58231,7 +58453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58245,7 +58467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58259,7 +58481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58273,7 +58495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58287,7 +58509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58301,7 +58523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58315,7 +58537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58329,7 +58551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58343,7 +58565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -58363,7 +58585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58377,7 +58599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58391,7 +58613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58405,7 +58627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58419,7 +58641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58438,7 +58660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 5361, 5368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58457,7 +58679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 6292, 6296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58476,7 +58698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7350, 7369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58495,7 +58717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7915, 7934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58514,7 +58736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1356, 1388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58533,7 +58755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1393, 1429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58552,7 +58774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1434, 1471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58571,7 +58793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1476, 1502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58590,7 +58812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1507, 1540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58604,12 +58826,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1545, 1562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1075),
+                    ty: DeclarationId(1082),
                 }],
             },
             type_params: vec![],
@@ -58623,7 +58845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1567, 1621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58637,7 +58859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 1626, 1633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58656,13 +58878,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2165, 2203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "amount".to_string(),
-                        ty: DeclarationId(1075),
+                        ty: DeclarationId(1082),
                     },
                     Field {
                         label: "collection".to_string(),
@@ -58681,13 +58903,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2208, 2282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(1075),
+                        ty: DeclarationId(1082),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -58706,13 +58928,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2287, 2362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "divisor".to_string(),
-                        ty: DeclarationId(1076),
+                        ty: DeclarationId(1083),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -58731,7 +58953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2367, 2440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1922),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58750,7 +58972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2445, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1923),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58769,7 +58991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2487, 2524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1924),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58788,7 +59010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2529, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1925),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58802,7 +59024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2575, 2591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1926),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58816,12 +59038,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2803, 2813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1927),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1075),
+                    ty: DeclarationId(1082),
                 }],
             },
             type_params: vec![],
@@ -58835,12 +59057,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2818, 2865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1928),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1076),
+                    ty: DeclarationId(1083),
                 }],
             },
             type_params: vec![],
@@ -58854,7 +59076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 2870, 2921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1929),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58868,7 +59090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3111, 3115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1930),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58882,7 +59104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3120, 3127),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1931),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58896,7 +59118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3132, 3138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1932),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58915,7 +59137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 3441, 3454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1933),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58929,7 +59151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7082, 7093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1934),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58943,7 +59165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7142, 7156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58957,7 +59179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation.dag", 7221, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58971,7 +59193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1937),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58985,7 +59207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1938),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58999,7 +59221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1939),
+            id: DeclarationId(1946),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59013,7 +59235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1940),
+            id: DeclarationId(1947),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59027,7 +59249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1941),
+            id: DeclarationId(1948),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59041,7 +59263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1942),
+            id: DeclarationId(1949),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59055,7 +59277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1943),
+            id: DeclarationId(1950),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59069,7 +59291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1944),
+            id: DeclarationId(1951),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59083,7 +59305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1945),
+            id: DeclarationId(1952),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59097,7 +59319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1946),
+            id: DeclarationId(1953),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59111,7 +59333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1947),
+            id: DeclarationId(1954),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59125,7 +59347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1948),
+            id: DeclarationId(1955),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59139,7 +59361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1949),
+            id: DeclarationId(1956),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59153,7 +59375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1950),
+            id: DeclarationId(1957),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -59173,7 +59395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1951),
+            id: DeclarationId(1958),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -59193,7 +59415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1952),
+            id: DeclarationId(1959),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59207,7 +59429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1953),
+            id: DeclarationId(1960),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59221,7 +59443,243 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1954),
+            id: DeclarationId(1961),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5402, 5406),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1962),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5409, 5415),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1963),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5418, 5420),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1964),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6236, 6240),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1965),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6243, 6247),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1966),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6250, 6254),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1967),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6257, 6262),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1968),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6265, 6276),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1969),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6279, 6292),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1970),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6872, 6877),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1971),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6880, 6889),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1972),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6892, 6898),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1973),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6901, 6905),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1974),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6908, 6912),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1975),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(606),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(607),
+                    value: DeclarationId(876),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8306, 8324),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1976),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(606),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(607),
+                    value: DeclarationId(877),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8720, 8748),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59235,7 +59693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1022, 1036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1955),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59249,7 +59707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1041, 1051),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1956),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59263,7 +59721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1056, 1068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1957),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59277,7 +59735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1958),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59291,7 +59749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1091, 1103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1959),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59305,7 +59763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1108, 1120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1960),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59319,7 +59777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1961),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59333,7 +59791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1152, 1171),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1962),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59347,7 +59805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1176, 1201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1963),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59361,12 +59819,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 1206, 1229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1964),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(872),
+                    ty: DeclarationId(879),
                 }],
             },
             type_params: vec![],
@@ -59380,12 +59838,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5429, 5465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1965),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(875),
+                    ty: DeclarationId(882),
                 }],
             },
             type_params: vec![],
@@ -59399,13 +59857,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5470, 5511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1966),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(873),
+                    value: DeclarationId(880),
                 }],
             },
             type_params: vec![],
@@ -59419,7 +59877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 5970, 5986),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1967),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59438,7 +59896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9098, 9139),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1968),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59452,7 +59910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9436, 9448),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1969),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -59472,7 +59930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9718, 9730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1970),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59482,7 +59940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1969),
+                        ty: DeclarationId(1992),
                     },
                 ],
             },
@@ -59497,7 +59955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 9675, 9732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1971),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59516,7 +59974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10042, 10076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1972),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59535,7 +59993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10479, 10530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1973),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59549,7 +60007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 10873, 10891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1974),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59578,13 +60036,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/diagnostics.dag", 11241, 11339),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(898),
+                    value: DeclarationId(905),
                 }],
             },
             type_params: vec![],
@@ -59598,18 +60056,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1976),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(897),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(904),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(898),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(905),
                     },
                 ],
             },
@@ -59624,18 +60082,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1977),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(897),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(904),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(898),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(905),
                     },
                 ],
             },
@@ -59650,18 +60108,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1978),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(897),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(904),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(898),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(905),
                     },
                 ],
             },
@@ -59676,13 +60134,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1979),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(901),
+                    value: DeclarationId(908),
                 }],
             },
             type_params: vec![],
@@ -59696,18 +60154,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(900),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(907),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(901),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(908),
                     },
                 ],
             },
@@ -59722,18 +60180,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1981),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(900),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(907),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(901),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(908),
                     },
                 ],
             },
@@ -59748,18 +60206,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1982),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(900),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(907),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(901),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(908),
                     },
                 ],
             },
@@ -59774,13 +60232,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1983),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(904),
+                    value: DeclarationId(911),
                 }],
             },
             type_params: vec![],
@@ -59794,18 +60252,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(903),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(910),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(904),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(911),
                     },
                 ],
             },
@@ -59820,18 +60278,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1985),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(903),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(910),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(904),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(911),
                     },
                 ],
             },
@@ -59846,13 +60304,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1986),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(907),
+                    value: DeclarationId(914),
                 }],
             },
             type_params: vec![],
@@ -59866,18 +60324,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1987),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(906),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(913),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(907),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(914),
                     },
                 ],
             },
@@ -59892,18 +60350,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1988),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(906),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(913),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(907),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(914),
                     },
                 ],
             },
@@ -59918,12 +60376,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1989),
+            id: DeclarationId(2012),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(880),
+                    ty: DeclarationId(887),
                 }],
             },
             type_params: vec![],
@@ -59937,7 +60395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1990),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59962,7 +60420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1991),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59976,12 +60434,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(877),
+                    ty: DeclarationId(884),
                 }],
             },
             type_params: vec![],
@@ -59995,13 +60453,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(879),
+                template: DeclarationId(886),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(880),
-                    value: DeclarationId(883),
+                    parameter: DeclarationId(887),
+                    value: DeclarationId(890),
                 }],
             },
             type_params: vec![],
@@ -60015,13 +60473,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1993),
+                    value: DeclarationId(2016),
                 }],
             },
             type_params: vec![],
@@ -60035,7 +60493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60045,11 +60503,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "composed".to_string(),
-                        ty: DeclarationId(883),
+                        ty: DeclarationId(890),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(2017),
                     },
                 ],
             },
@@ -60064,13 +60522,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(877),
+                    value: DeclarationId(884),
                 }],
             },
             type_params: vec![],
@@ -60084,13 +60542,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(879),
+                template: DeclarationId(886),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(880),
-                    value: DeclarationId(883),
+                    parameter: DeclarationId(887),
+                    value: DeclarationId(890),
                 }],
             },
             type_params: vec![],
@@ -60104,13 +60562,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1997),
+                    value: DeclarationId(2020),
                 }],
             },
             type_params: vec![],
@@ -60124,7 +60582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60134,11 +60592,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(2019),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2021),
                     },
                 ],
             },
@@ -60153,13 +60611,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(879),
+                template: DeclarationId(886),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(880),
-                    value: DeclarationId(885),
+                    parameter: DeclarationId(887),
+                    value: DeclarationId(892),
                 }],
             },
             type_params: vec![],
@@ -60173,11 +60631,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(746)],
-                output: DeclarationId(2000),
+                output: DeclarationId(2023),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -60191,13 +60649,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(20),
-                    value: DeclarationId(885),
+                    value: DeclarationId(892),
                 }],
             },
             type_params: vec![],
@@ -60211,11 +60669,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(746), DeclarationId(885)],
-                output: DeclarationId(881),
+                inputs: vec![DeclarationId(746), DeclarationId(892)],
+                output: DeclarationId(888),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -60229,13 +60687,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2027),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(26),
-                    value: DeclarationId(887),
+                    value: DeclarationId(894),
                 }],
             },
             type_params: vec![],
@@ -60249,13 +60707,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(911),
+                    value: DeclarationId(918),
                 }],
             },
             type_params: vec![],
@@ -60269,7 +60727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60283,7 +60741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60302,7 +60760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60321,7 +60779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60340,13 +60798,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(916),
+                    value: DeclarationId(923),
                 }],
             },
             type_params: vec![],
@@ -60360,7 +60818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60374,7 +60832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60388,7 +60846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60402,7 +60860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60416,7 +60874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60430,7 +60888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60444,7 +60902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60458,7 +60916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60472,7 +60930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60486,7 +60944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60500,7 +60958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60514,7 +60972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9026, 9035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60528,7 +60986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9040, 9053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60542,7 +61000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9058, 9066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60556,7 +61014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9071, 9081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60570,7 +61028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9086, 9096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60584,7 +61042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9101, 9112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60598,7 +61056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9117, 9125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60612,7 +61070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9130, 9137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60626,7 +61084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9142, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60640,7 +61098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9157, 9169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60654,7 +61112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11862, 11888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60668,7 +61126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11893, 11903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60682,7 +61140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16668, 16674),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60696,7 +61154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16679, 16690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60710,7 +61168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17010, 17021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60724,7 +61182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17026, 17037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60738,7 +61196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18970, 18981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60752,7 +61210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18986, 18994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60771,7 +61229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20157, 20192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -60796,13 +61254,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20197, 20285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(946),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
@@ -60816,7 +61274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60835,7 +61293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 20505, 20517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60854,13 +61312,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 21890, 21905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(977),
+                    value: DeclarationId(984),
                 }],
             },
             type_params: vec![],
@@ -60874,7 +61332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27797, 27812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60893,7 +61351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 31950, 31954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60912,7 +61370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 32246, 32250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60931,7 +61389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33495, 33499),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60950,7 +61408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 33970, 33974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60969,7 +61427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35233, 35237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -60988,7 +61446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 35505, 35509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61002,7 +61460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5562, 5577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61016,7 +61474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5617, 5630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61030,7 +61488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5678, 5695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61044,7 +61502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5734, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61058,13 +61516,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "field".to_string(),
-                        ty: DeclarationId(961),
+                        ty: DeclarationId(968),
                     },
                     Field {
                         label: "factor".to_string(),
@@ -61083,12 +61541,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field".to_string(),
-                    ty: DeclarationId(961),
+                    ty: DeclarationId(968),
                 }],
             },
             type_params: vec![],
@@ -61102,7 +61560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61127,7 +61585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61141,7 +61599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61155,7 +61613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61169,12 +61627,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24082, 24096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "degree".to_string(),
-                    ty: DeclarationId(1075),
+                    ty: DeclarationId(1082),
                 }],
             },
             type_params: vec![],
@@ -61188,17 +61646,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24101, 24148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "numerator".to_string(),
-                        ty: DeclarationId(1075),
+                        ty: DeclarationId(1082),
                     },
                     Field {
                         label: "root".to_string(),
-                        ty: DeclarationId(1075),
+                        ty: DeclarationId(1082),
                     },
                 ],
             },
@@ -61213,17 +61671,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24153, 24230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2064),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(1076),
+                        ty: DeclarationId(1083),
                     },
                     Field {
                         label: "argument".to_string(),
-                        ty: DeclarationId(1075),
+                        ty: DeclarationId(1082),
                     },
                 ],
             },
@@ -61238,7 +61696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24235, 24309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2065),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61248,7 +61706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "exponent".to_string(),
-                        ty: DeclarationId(974),
+                        ty: DeclarationId(981),
                     },
                 ],
             },
@@ -61263,7 +61721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 24929, 24985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2066),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61282,7 +61740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 25001, 25026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2067),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61296,12 +61754,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26675, 26688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2068),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cost".to_string(),
-                    ty: DeclarationId(976),
+                    ty: DeclarationId(983),
                 }],
             },
             type_params: vec![],
@@ -61315,13 +61773,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26732, 26764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2069),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(976),
+                    value: DeclarationId(983),
                 }],
             },
             type_params: vec![],
@@ -61335,12 +61793,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26827, 26843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2070),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2069),
+                    ty: DeclarationId(2092),
                 }],
             },
             type_params: vec![],
@@ -61354,13 +61812,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26803, 26845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2071),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(976),
+                    value: DeclarationId(983),
                 }],
             },
             type_params: vec![],
@@ -61374,13 +61832,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26907, 26923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(2071),
+                    value: DeclarationId(2094),
                 }],
             },
             type_params: vec![],
@@ -61394,12 +61852,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26902, 26924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2072),
+                    ty: DeclarationId(2095),
                 }],
             },
             type_params: vec![],
@@ -61413,13 +61871,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 26874, 26926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(977),
+                    value: DeclarationId(984),
                 }],
             },
             type_params: vec![],
@@ -61433,12 +61891,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27224, 27239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2074),
+                    ty: DeclarationId(2097),
                 }],
             },
             type_params: vec![],
@@ -61452,7 +61910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27206, 27241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61466,7 +61924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27324, 27336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61480,13 +61938,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/induction.dag", 27406, 27416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1120),
+                    value: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
@@ -61500,13 +61958,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(2079),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1120),
+                    value: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
@@ -61520,13 +61978,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(2080),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(879),
+                template: DeclarationId(886),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(880),
-                    value: DeclarationId(1016),
+                    parameter: DeclarationId(887),
+                    value: DeclarationId(1023),
                 }],
             },
             type_params: vec![],
@@ -61540,11 +61998,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(746)],
-                output: DeclarationId(2080),
+                output: DeclarationId(2103),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -61558,13 +62016,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(20),
-                    value: DeclarationId(1016),
+                    value: DeclarationId(1023),
                 }],
             },
             type_params: vec![],
@@ -61578,11 +62036,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1016), DeclarationId(1016)],
-                output: DeclarationId(1016),
+                inputs: vec![DeclarationId(1023), DeclarationId(1023)],
+                output: DeclarationId(1023),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -61596,11 +62054,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1016), DeclarationId(737)],
-                output: DeclarationId(1016),
+                inputs: vec![DeclarationId(1023), DeclarationId(737)],
+                output: DeclarationId(1023),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -61614,11 +62072,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(747), DeclarationId(1016)],
-                output: DeclarationId(881),
+                inputs: vec![DeclarationId(747), DeclarationId(1023)],
+                output: DeclarationId(888),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -61632,12 +62090,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(81),
                 }],
             },
@@ -61652,12 +62110,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2087),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(81),
                 }],
             },
@@ -61672,7 +62130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61686,12 +62144,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1018),
+                    ty: DeclarationId(1025),
                 }],
             },
             type_params: vec![],
@@ -61705,13 +62163,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1035),
+                    value: DeclarationId(1042),
                 }],
             },
             type_params: vec![],
@@ -61725,11 +62183,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1034),
+                    DeclarationId(1041),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -61744,13 +62202,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1027),
+                    value: DeclarationId(1034),
                 }],
             },
             type_params: vec![],
@@ -61764,12 +62222,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2092),
+                    ty: DeclarationId(2115),
                 }],
             },
             type_params: vec![],
@@ -61783,13 +62241,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1024),
+                    value: DeclarationId(1031),
                 }],
             },
             type_params: vec![],
@@ -61803,12 +62261,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2094),
+                    ty: DeclarationId(2117),
                 }],
             },
             type_params: vec![],
@@ -61822,7 +62280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61847,13 +62305,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1027),
+                    value: DeclarationId(1034),
                 }],
             },
             type_params: vec![],
@@ -61867,7 +62325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61877,7 +62335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2120),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61896,13 +62354,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inner".to_string(),
-                        ty: DeclarationId(1027),
+                        ty: DeclarationId(1034),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61921,13 +62379,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1027),
+                    value: DeclarationId(1034),
                 }],
             },
             type_params: vec![],
@@ -61941,17 +62399,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "output".to_string(),
-                        ty: DeclarationId(1027),
+                        ty: DeclarationId(1034),
                     },
                     Field {
                         label: "span".to_string(),
@@ -61970,7 +62428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61995,7 +62453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62024,13 +62482,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1031),
+                    value: DeclarationId(1038),
                 }],
             },
             type_params: vec![],
@@ -62044,7 +62502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62054,7 +62512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2127),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62073,7 +62531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62092,7 +62550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4578, 4586),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62111,7 +62569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4591, 4601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62130,13 +62588,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4606, 4620),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1033),
+                        ty: DeclarationId(1040),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62155,7 +62613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4734, 4785),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62180,7 +62638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4790, 4828),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -62200,7 +62658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4856, 4868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -62220,17 +62678,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4890, 4906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62249,13 +62707,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4833, 4935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1034),
+                    value: DeclarationId(1041),
                 }],
             },
             type_params: vec![],
@@ -62269,7 +62727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4980, 4997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62279,7 +62737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2114),
+                        ty: DeclarationId(2137),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62298,7 +62756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 4940, 5026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -62318,7 +62776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5597, 5609),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2117),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -62338,13 +62796,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5631, 5647),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2118),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1034),
+                    value: DeclarationId(1041),
                 }],
             },
             type_params: vec![],
@@ -62358,21 +62816,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5660, 5677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2119),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "segments".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2139),
                     },
                     Field {
                         label: "segment_spans".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2141),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62391,13 +62849,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5570, 5706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2120),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1028),
+                    value: DeclarationId(1035),
                 }],
             },
             type_params: vec![],
@@ -62411,7 +62869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5762, 5786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2121),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62421,7 +62879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2143),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62440,13 +62898,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5711, 5815),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2122),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1034),
+                    value: DeclarationId(1041),
                 }],
             },
             type_params: vec![],
@@ -62460,7 +62918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5866, 5883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2123),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62470,7 +62928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62489,7 +62947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5820, 5912),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2124),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -62509,17 +62967,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5940, 5952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2125),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62538,21 +62996,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 5917, 6005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2126),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "cond".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                     Field {
                         label: "then_branch".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                     Field {
                         label: "else_branch".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62571,13 +63029,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6010, 6129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2127),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1030),
+                    value: DeclarationId(1037),
                 }],
             },
             type_params: vec![],
@@ -62591,17 +63049,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6183, 6204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2128),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "scrutinee".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                     Field {
                         label: "arms".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62620,13 +63078,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6134, 6233),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1028),
+                    value: DeclarationId(1035),
                 }],
             },
             type_params: vec![],
@@ -62640,13 +63098,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6261, 6285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62665,13 +63123,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6238, 6314),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1034),
+                    value: DeclarationId(1041),
                 }],
             },
             type_params: vec![],
@@ -62685,13 +63143,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6342, 6359),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "elements".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62710,13 +63168,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 6319, 6388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1029),
+                    value: DeclarationId(1036),
                 }],
             },
             type_params: vec![],
@@ -62730,13 +63188,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8482, 8503),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "entries".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62755,11 +63213,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 8461, 8532),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1027),
+                    DeclarationId(1034),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62774,7 +63232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9463, 9475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62784,11 +63242,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_ann".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "expr".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                 ],
             },
@@ -62803,7 +63261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9422, 9505),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -62823,13 +63281,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9553, 9565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1023),
+                    value: DeclarationId(1030),
                 }],
             },
             type_params: vec![],
@@ -62843,7 +63301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9580, 9598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62853,19 +63311,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "return_type".to_string(),
-                        ty: DeclarationId(1027),
+                        ty: DeclarationId(1034),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                     Field {
                         label: "span".to_string(),
@@ -62884,7 +63342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9510, 9682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -62904,13 +63362,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9742, 9754),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1023),
+                    value: DeclarationId(1030),
                 }],
             },
             type_params: vec![],
@@ -62924,7 +63382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9769, 9787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62934,15 +63392,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2163),
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "return_type".to_string(),
-                        ty: DeclarationId(1027),
+                        ty: DeclarationId(1034),
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -62965,11 +63423,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9687, 9875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1034),
+                    DeclarationId(1041),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -62984,7 +63442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9940, 9952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62994,11 +63452,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "ty".to_string(),
-                        ty: DeclarationId(1027),
+                        ty: DeclarationId(1034),
                     },
                     Field {
                         label: "body".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "body_span".to_string(),
@@ -63021,7 +63479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 9880, 10009),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -63041,13 +63499,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10029, 10041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "span".to_string(),
@@ -63066,7 +63524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10014, 10061),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -63086,7 +63544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10087, 10099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -63106,17 +63564,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10113, 10125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "path".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "names".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "span".to_string(),
@@ -63135,7 +63593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10066, 10154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -63155,7 +63613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10208, 10220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63165,7 +63623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "span".to_string(),
@@ -63184,7 +63642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10159, 10249),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -63204,13 +63662,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10305, 10317),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1024),
+                    value: DeclarationId(1031),
                 }],
             },
             type_params: vec![],
@@ -63224,7 +63682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10332, 10350),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63234,11 +63692,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2175),
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "span".to_string(),
@@ -63257,7 +63715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10254, 10379),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -63277,13 +63735,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10432, 10444),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1025),
+                    value: DeclarationId(1032),
                 }],
             },
             type_params: vec![],
@@ -63297,11 +63755,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10461, 10481),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1027),
+                    DeclarationId(1034),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63316,7 +63774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10498, 10510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63326,15 +63784,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "variants".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "span".to_string(),
@@ -63353,7 +63811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10384, 10539),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -63373,11 +63831,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10594, 10606),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1034),
+                    DeclarationId(1041),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63392,7 +63850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10678, 10690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63402,7 +63860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "nominal_opaque".to_string(),
@@ -63410,11 +63868,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1027),
+                        ty: DeclarationId(1034),
                     },
                     Field {
                         label: "refinement".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2183),
                     },
                     Field {
                         label: "span".to_string(),
@@ -63433,13 +63891,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/parse_surface.dag", 10544, 10719),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(946),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
@@ -63457,7 +63915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63476,13 +63934,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1048),
+                    value: DeclarationId(1055),
                 }],
             },
             type_params: vec![],
@@ -63496,12 +63954,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2164),
+                    ty: DeclarationId(2187),
                 }],
             },
             type_params: vec![],
@@ -63515,7 +63973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -63525,7 +63983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1049),
+                        ty: DeclarationId(1056),
                     },
                 ],
             },
@@ -63540,7 +63998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63559,7 +64017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63578,7 +64036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(109),
@@ -63589,7 +64047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(111),
-                        value: DeclarationId(1049),
+                        value: DeclarationId(1056),
                     },
                 ],
             },
@@ -63604,13 +64062,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1052),
+                    value: DeclarationId(1059),
                 }],
             },
             type_params: vec![],
@@ -63624,12 +64082,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 4537, 4552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "input_order".to_string(),
-                    ty: DeclarationId(1056),
+                    ty: DeclarationId(1063),
                 }],
             },
             type_params: vec![],
@@ -63643,7 +64101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5405, 5459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63657,13 +64115,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/runtime.dag", 5724, 5733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(946),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
@@ -63677,7 +64135,7 @@ 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(2174),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(109),
@@ -63688,7 +64146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(111),
-                        value: DeclarationId(1063),
+                        value: DeclarationId(1070),
                     },
                 ],
             },
@@ -63703,11 +64161,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1067),
+                    DeclarationId(1074),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63722,11 +64180,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1067),
+                    DeclarationId(1074),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63741,11 +64199,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1067),
+                    DeclarationId(1074),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63760,7 +64218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(109),
@@ -63771,7 +64229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(111),
-                        value: DeclarationId(1067),
+                        value: DeclarationId(1074),
                     },
                 ],
             },
@@ -63786,7 +64244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(109),
@@ -63797,7 +64255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     TemplateArgument {
                         parameter: DeclarationId(111),
-                        value: DeclarationId(1067),
+                        value: DeclarationId(1074),
                     },
                 ],
             },
@@ -63812,11 +64270,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1075),
+                    DeclarationId(1082),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63831,11 +64289,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1076),
+                    DeclarationId(1083),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -63850,7 +64308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63864,7 +64322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 667, 673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63878,7 +64336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 678, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -63892,7 +64350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 696, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63911,7 +64369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63930,7 +64388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63949,7 +64407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63968,7 +64426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -63987,7 +64445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64001,12 +64459,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "previous".to_string(),
-                    ty: DeclarationId(1075),
+                    ty: DeclarationId(1082),
                 }],
             },
             type_params: vec![],
@@ -64020,7 +64478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64034,12 +64492,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inner".to_string(),
-                    ty: DeclarationId(1076),
+                    ty: DeclarationId(1083),
                 }],
             },
             type_params: vec![],
@@ -64053,7 +64511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64072,12 +64530,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "amount".to_string(),
-                    ty: DeclarationId(1075),
+                    ty: DeclarationId(1082),
                 }],
             },
             type_params: vec![],
@@ -64091,12 +64549,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1075),
+                    ty: DeclarationId(1082),
                 }],
             },
             type_params: vec![],
@@ -64110,12 +64568,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1076),
+                    ty: DeclarationId(1083),
                 }],
             },
             type_params: vec![],
@@ -64129,7 +64587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64148,7 +64606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64167,7 +64625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64181,13 +64639,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1074),
+                    value: DeclarationId(1081),
                 }],
             },
             type_params: vec![],
@@ -64201,13 +64659,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1067),
+                    value: DeclarationId(1074),
                 }],
             },
             type_params: vec![],
@@ -64221,7 +64679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64235,7 +64693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64249,7 +64707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64263,7 +64721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2206),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64277,7 +64735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2207),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64291,7 +64749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2208),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64305,7 +64763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2209),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64319,7 +64777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2210),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64333,7 +64791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2211),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64347,7 +64805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2212),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64361,7 +64819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2213),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64375,7 +64833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2214),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64389,7 +64847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2215),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64403,7 +64861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2216),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64422,7 +64880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2217),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64441,7 +64899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 809, 820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2218),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -64460,7 +64918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 825, 842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2219),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64474,7 +64932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 847, 849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64488,7 +64946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 854, 858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64502,7 +64960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 863, 868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64516,7 +64974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 873, 875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64530,7 +64988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 880, 882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64544,7 +65002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64558,7 +65016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64572,7 +65030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64586,7 +65044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 910, 915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64600,7 +65058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 920, 924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64614,7 +65072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 929, 934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64628,7 +65086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 939, 945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64642,7 +65100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 950, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64656,7 +65114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64670,7 +65128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 973, 978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64684,7 +65142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 983, 991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64698,7 +65156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 996, 1005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64712,7 +65170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64726,7 +65184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1018, 1024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64740,7 +65198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1029, 1035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64754,7 +65212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1040, 1046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64768,7 +65226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1051, 1057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64782,7 +65240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1062, 1070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64796,7 +65254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1075, 1083),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64810,7 +65268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1088, 1093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64824,7 +65282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1098, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64838,7 +65296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64852,7 +65310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1121, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64866,7 +65324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64880,7 +65338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1708, 1713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64894,7 +65352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1718, 1722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64908,7 +65366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1727, 1733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64922,7 +65380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1738, 1744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2252),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64936,7 +65394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1749, 1753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2253),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64950,7 +65408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1758, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2254),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64964,7 +65422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1769, 1777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64978,7 +65436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1782, 1790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2256),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -64992,7 +65450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1795, 1802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65006,7 +65464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1807, 1813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65020,7 +65478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1818, 1825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65034,7 +65492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1830, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65048,7 +65506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65062,7 +65520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2288, 2290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65076,7 +65534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2295, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65090,7 +65548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2304, 2309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65104,7 +65562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2314, 2316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65118,7 +65576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2321, 2323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65132,7 +65590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2328, 2330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65146,7 +65604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2335, 2337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65160,7 +65618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65174,7 +65632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2351, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65188,7 +65646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2361, 2365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65202,7 +65660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2375),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65216,7 +65674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2380, 2386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2273),
+            id: DeclarationId(2296),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65230,7 +65688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2391, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2274),
+            id: DeclarationId(2297),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65244,7 +65702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2275),
+            id: DeclarationId(2298),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65258,7 +65716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2414, 2419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2276),
+            id: DeclarationId(2299),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65272,7 +65730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2424, 2432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2277),
+            id: DeclarationId(2300),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65286,7 +65744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2437, 2446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2278),
+            id: DeclarationId(2301),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65300,7 +65758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2451, 2454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2279),
+            id: DeclarationId(2302),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65314,7 +65772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2459, 2465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2280),
+            id: DeclarationId(2303),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65328,7 +65786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2470, 2476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2281),
+            id: DeclarationId(2304),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65342,7 +65800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2481, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2282),
+            id: DeclarationId(2305),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65356,7 +65814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2492, 2498),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2283),
+            id: DeclarationId(2306),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65370,7 +65828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2503, 2511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2284),
+            id: DeclarationId(2307),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65384,7 +65842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2516, 2524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2285),
+            id: DeclarationId(2308),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65398,7 +65856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2529, 2534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2286),
+            id: DeclarationId(2309),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65412,7 +65870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2539, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2287),
+            id: DeclarationId(2310),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65426,7 +65884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2288),
+            id: DeclarationId(2311),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65440,13 +65898,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2562, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2289),
+            id: DeclarationId(2312),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1047),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -65460,13 +65918,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16828, 16851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2290),
+            id: DeclarationId(2313),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1107),
+                    value: DeclarationId(1114),
                 }],
             },
             type_params: vec![],
@@ -65480,13 +65938,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17053, 17068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2291),
+            id: DeclarationId(2314),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1109),
+                    value: DeclarationId(1116),
                 }],
             },
             type_params: vec![],
@@ -65500,7 +65958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 17073, 17093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2292),
+            id: DeclarationId(2315),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65514,7 +65972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2293),
+            id: DeclarationId(2316),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65528,7 +65986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2294),
+            id: DeclarationId(2317),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65542,7 +66000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2295),
+            id: DeclarationId(2318),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65556,7 +66014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2296),
+            id: DeclarationId(2319),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65570,7 +66028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2297),
+            id: DeclarationId(2320),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65584,7 +66042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2298),
+            id: DeclarationId(2321),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65598,7 +66056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2299),
+            id: DeclarationId(2322),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65612,7 +66070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2300),
+            id: DeclarationId(2323),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65626,7 +66084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2301),
+            id: DeclarationId(2324),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65640,7 +66098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2302),
+            id: DeclarationId(2325),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65654,7 +66112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2303),
+            id: DeclarationId(2326),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65673,7 +66131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2304),
+            id: DeclarationId(2327),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65687,7 +66145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2305),
+            id: DeclarationId(2328),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65701,7 +66159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2306),
+            id: DeclarationId(2329),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65715,7 +66173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4620, 4633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2307),
+            id: DeclarationId(2330),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65729,7 +66187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2308),
+            id: DeclarationId(2331),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65743,7 +66201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4656, 4664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2309),
+            id: DeclarationId(2332),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -65757,12 +66215,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4689, 4697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2310),
+            id: DeclarationId(2333),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1101),
+                    ty: DeclarationId(1108),
                 }],
             },
             type_params: vec![],
@@ -65776,7 +66234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4702, 4742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2311),
+            id: DeclarationId(2334),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65795,7 +66253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4747, 4780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2312),
+            id: DeclarationId(2335),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65805,7 +66263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(1102),
+                        ty: DeclarationId(1109),
                     },
                 ],
             },
@@ -65820,7 +66278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 4785, 4863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2313),
+            id: DeclarationId(2336),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -65839,7 +66297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5029, 5092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2314),
+            id: DeclarationId(2337),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65868,21 +66326,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5097, 5188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2315),
+            id: DeclarationId(2338),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "input_sample".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "expected_output".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -65897,17 +66355,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5193, 5325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2316),
+            id: DeclarationId(2339),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "invariant".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -65922,7 +66380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 5540, 5629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2317),
+            id: DeclarationId(2340),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -65942,7 +66400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6429, 6441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2318),
+            id: DeclarationId(2341),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -65952,7 +66410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2317),
+                        ty: DeclarationId(2340),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -65971,7 +66429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 6378, 6475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2319),
+            id: DeclarationId(2342),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -65991,7 +66449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7175, 7187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2320),
+            id: DeclarationId(2343),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66001,7 +66459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2319),
+                        ty: DeclarationId(2342),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -66020,21 +66478,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7125, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2321),
+            id: DeclarationId(2344),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "expected_ref".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -66049,21 +66507,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7519, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2322),
+            id: DeclarationId(2345),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_ref".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "oracle_ref".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -66078,12 +66536,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 7903, 8028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2323),
+            id: DeclarationId(2346),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "expected".to_string(),
-                    ty: DeclarationId(1120),
+                    ty: DeclarationId(1127),
                 }],
             },
             type_params: vec![],
@@ -66097,17 +66555,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10081, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2324),
+            id: DeclarationId(2347),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "left_report_ref".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "right_report_ref".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -66122,17 +66580,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 10709, 10821),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2325),
+            id: DeclarationId(2348),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "law".to_string(),
-                        ty: DeclarationId(1103),
+                        ty: DeclarationId(1110),
                     },
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -66147,17 +66605,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11417, 11496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2326),
+            id: DeclarationId(2349),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1092),
+                        ty: DeclarationId(1099),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -66176,21 +66634,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11716, 11829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2327),
+            id: DeclarationId(2350),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1092),
+                        ty: DeclarationId(1099),
                     },
                     Field {
                         label: "subset_predicate".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -66205,17 +66663,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11834, 11970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2328),
+            id: DeclarationId(2351),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "compile_target".to_string(),
-                        ty: DeclarationId(1090),
+                        ty: DeclarationId(1097),
                     },
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1091),
+                        ty: DeclarationId(1098),
                     },
                 ],
             },
@@ -66230,17 +66688,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 11975, 12057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2329),
+            id: DeclarationId(2352),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "ratchet_kind".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -66255,13 +66713,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12062, 12148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2330),
+            id: DeclarationId(2353),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1090),
+                    value: DeclarationId(1097),
                 }],
             },
             type_params: vec![],
@@ -66275,17 +66733,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12227, 12237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2331),
+            id: DeclarationId(2354),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2330),
+                        ty: DeclarationId(2353),
                     },
                 ],
             },
@@ -66300,21 +66758,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 12153, 12243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2332),
+            id: DeclarationId(2355),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -66329,21 +66787,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13185, 13319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2333),
+            id: DeclarationId(2356),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1120),
+                        ty: DeclarationId(1127),
                     },
                 ],
             },
@@ -66358,7 +66816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 13958, 14102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2334),
+            id: DeclarationId(2357),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -66377,13 +66835,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 14947, 15001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2335),
+            id: DeclarationId(2358),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1047),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -66397,13 +66855,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16045, 16068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2336),
+            id: DeclarationId(2359),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1107),
+                    value: DeclarationId(1114),
                 }],
             },
             type_params: vec![],
@@ -66417,13 +66875,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16114, 16129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2337),
+            id: DeclarationId(2360),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1047),
+                    value: DeclarationId(1054),
                 }],
             },
             type_params: vec![],
@@ -66437,7 +66895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/verification.dag", 16385, 16408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2338),
+            id: DeclarationId(2361),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -66457,7 +66915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2339),
+            id: DeclarationId(2362),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66471,7 +66929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2340),
+            id: DeclarationId(2363),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66485,7 +66943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2341),
+            id: DeclarationId(2364),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66499,7 +66957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2342),
+            id: DeclarationId(2365),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -66518,7 +66976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2343),
+            id: DeclarationId(2366),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66532,7 +66990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2344),
+            id: DeclarationId(2367),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66546,7 +67004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2345),
+            id: DeclarationId(2368),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66560,7 +67018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2346),
+            id: DeclarationId(2369),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66574,7 +67032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2347),
+            id: DeclarationId(2370),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66588,7 +67046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2348),
+            id: DeclarationId(2371),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66602,7 +67060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2349),
+            id: DeclarationId(2372),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66616,7 +67074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2350),
+            id: DeclarationId(2373),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66630,7 +67088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2351),
+            id: DeclarationId(2374),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66644,7 +67102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2352),
+            id: DeclarationId(2375),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66658,7 +67116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2353),
+            id: DeclarationId(2376),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66672,7 +67130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2354),
+            id: DeclarationId(2377),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66686,7 +67144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2355),
+            id: DeclarationId(2378),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66700,7 +67158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2356),
+            id: DeclarationId(2379),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -66714,7 +67172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2357),
+            id: DeclarationId(2380),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66724,11 +67182,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1507),
+                        ty: DeclarationId(1514),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1509),
+                        ty: DeclarationId(1516),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -66744,7 +67202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1510),
+                        ty: DeclarationId(1517),
                     },
                 ],
             },
@@ -66759,7 +67217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2358),
+            id: DeclarationId(2381),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -66769,11 +67227,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1508),
+                        ty: DeclarationId(1515),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1509),
+                        ty: DeclarationId(1516),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -66792,13 +67250,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec<Declaration> {
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2359),
+            id: DeclarationId(2382),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1511),
+                    value: DeclarationId(1518),
                 }],
             },
             type_params: vec![],
@@ -66926,7 +67384,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(13),
             Port {
                 id: PortId(13),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1733))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1740))),
                 produced_by: Some(NodeId(9)),
             },
         );
@@ -66950,7 +67408,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(16),
             Port {
                 id: PortId(16),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1734))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1741))),
                 produced_by: None,
             },
         );
@@ -66958,7 +67416,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(17),
             Port {
                 id: PortId(17),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1735))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1742))),
                 produced_by: Some(NodeId(11)),
             },
         );
@@ -67246,7 +67704,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(53),
             Port {
                 id: PortId(53),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1736))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1743))),
                 produced_by: None,
             },
         );
@@ -68118,7 +68576,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(162),
             Port {
                 id: PortId(162),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1737))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1744))),
                 produced_by: None,
             },
         );
@@ -68142,7 +68600,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(165),
             Port {
                 id: PortId(165),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1734))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1741))),
                 produced_by: Some(NodeId(114)),
             },
         );
@@ -68158,7 +68616,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(167),
             Port {
                 id: PortId(167),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1738))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1745))),
                 produced_by: Some(NodeId(116)),
             },
         );
@@ -68166,7 +68624,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(168),
             Port {
                 id: PortId(168),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1739))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1746))),
                 produced_by: None,
             },
         );
@@ -68270,7 +68728,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(181),
             Port {
                 id: PortId(181),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1740))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1747))),
                 produced_by: Some(NodeId(129)),
             },
         );
@@ -68278,7 +68736,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(182),
             Port {
                 id: PortId(182),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1741))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1748))),
                 produced_by: None,
             },
         );
@@ -68326,7 +68784,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(188),
             Port {
                 id: PortId(188),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1742))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1749))),
                 produced_by: Some(NodeId(136)),
             },
         );
@@ -68334,7 +68792,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(189),
             Port {
                 id: PortId(189),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1743))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1750))),
                 produced_by: None,
             },
         );
@@ -68414,7 +68872,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(199),
             Port {
                 id: PortId(199),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1744))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1751))),
                 produced_by: None,
             },
         );
@@ -68518,7 +68976,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(212),
             Port {
                 id: PortId(212),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1745))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1752))),
                 produced_by: Some(NodeId(158)),
             },
         );
@@ -68798,7 +69256,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(247),
             Port {
                 id: PortId(247),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1746))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1753))),
                 produced_by: None,
             },
         );
@@ -68910,7 +69368,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(261),
             Port {
                 id: PortId(261),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1747))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1754))),
                 produced_by: None,
             },
         );
@@ -69022,7 +69480,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(275),
             Port {
                 id: PortId(275),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1748))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1755))),
                 produced_by: None,
             },
         );
@@ -69638,7 +70096,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(352),
             Port {
                 id: PortId(352),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1749))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1756))),
                 produced_by: None,
             },
         );
@@ -69750,7 +70208,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(366),
             Port {
                 id: PortId(366),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1750))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1757))),
                 produced_by: Some(NodeId(267)),
             },
         );
@@ -69758,7 +70216,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(367),
             Port {
                 id: PortId(367),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1751))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1758))),
                 produced_by: None,
             },
         );
@@ -69814,7 +70272,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(374),
             Port {
                 id: PortId(374),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1752))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1759))),
                 produced_by: Some(NodeId(274)),
             },
         );
@@ -69822,7 +70280,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(375),
             Port {
                 id: PortId(375),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1753))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1760))),
                 produced_by: None,
             },
         );
@@ -69838,7 +70296,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(377),
             Port {
                 id: PortId(377),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1754))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1761))),
                 produced_by: Some(NodeId(277)),
             },
         );
@@ -69854,7 +70312,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap<PortId, Port> {
             PortId(379),
             Port {
                 id: PortId(379),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2338))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2361))),
                 produced_by: Some(NodeId(279)),
             },
         );
diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
index 413ddd5fcb8..6ed70943766 100644
--- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
+++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs
@@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         ports: bootstrapped_fixture_without_parse_surface_dag_ports(),
         diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(),
         next_node_id: 315,
-        next_declaration_id: 2273,
+        next_declaration_id: 2296,
         next_port_id: 420,
         primitives: PrimitiveCache::default(),
         substrate_markers: SubstrateMarkers::default(),
@@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag {
         emit_model_variants: EmitModelVariants::default(),
         clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(),
         optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(),
-        declaration_append_begin_after_bootstrap: 2273,
+        declaration_append_begin_after_bootstrap: 2296,
     }
 }
 
@@ -119,21 +119,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(7),
-            target: TransformTarget::Callable(DeclarationId(1762)),
+            target: TransformTarget::Callable(DeclarationId(1769)),
             inputs: vec![PortId(9)],
             output: PortId(11),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11303, 11315),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(8),
-            target: TransformTarget::Callable(DeclarationId(1764)),
+            target: TransformTarget::Callable(DeclarationId(1771)),
             inputs: vec![PortId(11)],
             output: PortId(12),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11296, 11343),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(9),
-            target: TransformTarget::Callable(DeclarationId(1718)),
+            target: TransformTarget::Callable(DeclarationId(1725)),
             inputs: vec![PortId(9), PortId(10), PortId(12)],
             output: PortId(13),
             span: SourceSpan::new("src/v3/std/algebra.dag", 10957, 11347),
@@ -149,7 +149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(11),
-            target: TransformTarget::Callable(DeclarationId(1720)),
+            target: TransformTarget::Callable(DeclarationId(1727)),
             inputs: vec![PortId(14), PortId(15), PortId(16)],
             output: PortId(17),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11478, 11534),
@@ -165,7 +165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(13),
-            target: TransformTarget::Callable(DeclarationId(1765)),
+            target: TransformTarget::Callable(DeclarationId(1772)),
             inputs: vec![PortId(18)],
             output: PortId(19),
             span: SourceSpan::new("src/v3/std/algebra.dag", 11603, 11618),
@@ -318,7 +318,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(27),
-            target: TransformTarget::Callable(DeclarationId(1758)),
+            target: TransformTarget::Callable(DeclarationId(1765)),
             inputs: vec![PortId(35)],
             output: PortId(36),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12133, 12157),
@@ -348,7 +348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(31),
-            target: TransformTarget::Callable(DeclarationId(1756)),
+            target: TransformTarget::Callable(DeclarationId(1763)),
             inputs: vec![PortId(40)],
             output: PortId(41),
             span: SourceSpan::new("src/v3/std/algebra.dag", 12426, 12461),
@@ -478,14 +478,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(43),
-            target: TransformTarget::Callable(DeclarationId(1752)),
+            target: TransformTarget::Callable(DeclarationId(1759)),
             inputs: vec![PortId(54)],
             output: PortId(55),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14022, 14037),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(44),
-            target: TransformTarget::Callable(DeclarationId(1767)),
+            target: TransformTarget::Callable(DeclarationId(1774)),
             inputs: vec![PortId(53), PortId(55)],
             output: PortId(56),
             span: SourceSpan::new("src/v3/std/algebra.dag", 14010, 14053),
@@ -1195,7 +1195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(91),
-            target: TransformTarget::Callable(DeclarationId(1769)),
+            target: TransformTarget::Callable(DeclarationId(1776)),
             inputs: vec![PortId(136), PortId(137)],
             output: PortId(138),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16719, 16829),
@@ -1223,7 +1223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(95),
-            target: TransformTarget::Callable(DeclarationId(1771)),
+            target: TransformTarget::Callable(DeclarationId(1778)),
             inputs: vec![PortId(141), PortId(142)],
             output: PortId(143),
             span: SourceSpan::new("src/v3/std/algebra.dag", 16884, 16994),
@@ -1533,7 +1533,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             id: NodeId(114),
             target: TransformTarget::FieldProject {
                 field_label: "rest".to_string(),
-                field_child: Some(DeclarationId(1532)),
+                field_child: Some(DeclarationId(1539)),
             },
             inputs: vec![PortId(162)],
             output: PortId(165),
@@ -1541,14 +1541,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(115),
-            target: TransformTarget::Callable(DeclarationId(1772)),
+            target: TransformTarget::Callable(DeclarationId(1779)),
             inputs: vec![PortId(164), PortId(165)],
             output: PortId(166),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18445, 18475),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(116),
-            target: TransformTarget::Callable(DeclarationId(1773)),
+            target: TransformTarget::Callable(DeclarationId(1780)),
             inputs: vec![PortId(163), PortId(166)],
             output: PortId(167),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18427, 18476),
@@ -1564,7 +1564,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(118),
-            target: TransformTarget::Callable(DeclarationId(1774)),
+            target: TransformTarget::Callable(DeclarationId(1781)),
             inputs: vec![],
             output: PortId(169),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18755, 18762),
@@ -1632,7 +1632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(126),
-            target: TransformTarget::Callable(DeclarationId(1775)),
+            target: TransformTarget::Callable(DeclarationId(1782)),
             inputs: vec![PortId(175), PortId(177)],
             output: PortId(178),
             span: SourceSpan::new("src/v3/std/algebra.dag", 18889, 18941),
@@ -1728,21 +1728,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(133),
-            target: TransformTarget::Callable(DeclarationId(1752)),
+            target: TransformTarget::Callable(DeclarationId(1759)),
             inputs: vec![PortId(184)],
             output: PortId(185),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19275, 19290),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(134),
-            target: TransformTarget::Callable(DeclarationId(1776)),
+            target: TransformTarget::Callable(DeclarationId(1783)),
             inputs: vec![],
             output: PortId(186),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19292, 19299),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(135),
-            target: TransformTarget::Callable(DeclarationId(1777)),
+            target: TransformTarget::Callable(DeclarationId(1784)),
             inputs: vec![PortId(185), PortId(186)],
             output: PortId(187),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19270, 19300),
@@ -1881,7 +1881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(147),
-            target: TransformTarget::Callable(DeclarationId(1778)),
+            target: TransformTarget::Callable(DeclarationId(1785)),
             inputs: vec![],
             output: PortId(200),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19749, 19756),
@@ -1949,7 +1949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(155),
-            target: TransformTarget::Callable(DeclarationId(1779)),
+            target: TransformTarget::Callable(DeclarationId(1786)),
             inputs: vec![PortId(206), PortId(208)],
             output: PortId(209),
             span: SourceSpan::new("src/v3/std/algebra.dag", 19887, 19944),
@@ -2354,7 +2354,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(181),
-            target: TransformTarget::Callable(DeclarationId(1752)),
+            target: TransformTarget::Callable(DeclarationId(1759)),
             inputs: vec![PortId(248)],
             output: PortId(249),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21332, 21347),
@@ -2401,7 +2401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(186),
-            target: TransformTarget::Callable(DeclarationId(1780)),
+            target: TransformTarget::Callable(DeclarationId(1787)),
             inputs: vec![PortId(254), PortId(255)],
             output: PortId(256),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21469, 21501),
@@ -2498,7 +2498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(193),
-            target: TransformTarget::Callable(DeclarationId(1752)),
+            target: TransformTarget::Callable(DeclarationId(1759)),
             inputs: vec![PortId(262)],
             output: PortId(263),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21603, 21618),
@@ -2562,7 +2562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(200),
-            target: TransformTarget::Callable(DeclarationId(1758)),
+            target: TransformTarget::Callable(DeclarationId(1765)),
             inputs: vec![PortId(271)],
             output: PortId(272),
             span: SourceSpan::new("src/v3/std/algebra.dag", 21721, 21780),
@@ -2645,7 +2645,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(205),
-            target: TransformTarget::Callable(DeclarationId(1752)),
+            target: TransformTarget::Callable(DeclarationId(1759)),
             inputs: vec![PortId(276)],
             output: PortId(277),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22069, 22084),
@@ -2746,7 +2746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(216),
-            target: TransformTarget::Callable(DeclarationId(1756)),
+            target: TransformTarget::Callable(DeclarationId(1763)),
             inputs: vec![PortId(290)],
             output: PortId(291),
             span: SourceSpan::new("src/v3/std/algebra.dag", 22311, 22374),
@@ -3218,7 +3218,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(245),
-            target: TransformTarget::Callable(DeclarationId(1756)),
+            target: TransformTarget::Callable(DeclarationId(1763)),
             inputs: vec![PortId(340)],
             output: PortId(341),
             span: SourceSpan::new("src/v3/std/algebra.dag", 23757, 23785),
@@ -3313,7 +3313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(256),
-            target: TransformTarget::Callable(DeclarationId(1781)),
+            target: TransformTarget::Callable(DeclarationId(1788)),
             inputs: vec![],
             output: PortId(354),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24140, 24147),
@@ -3381,7 +3381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(264),
-            target: TransformTarget::Callable(DeclarationId(1782)),
+            target: TransformTarget::Callable(DeclarationId(1789)),
             inputs: vec![PortId(360), PortId(362)],
             output: PortId(363),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24288, 24353),
@@ -3470,7 +3470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(270),
-            target: TransformTarget::Callable(DeclarationId(1784)),
+            target: TransformTarget::Callable(DeclarationId(1791)),
             inputs: vec![PortId(367), PortId(369)],
             output: PortId(370),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24471, 24529),
@@ -3491,7 +3491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(273),
-            target: TransformTarget::Callable(DeclarationId(1785)),
+            target: TransformTarget::Callable(DeclarationId(1792)),
             inputs: vec![PortId(368), PortId(372)],
             output: PortId(373),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24555, 24601),
@@ -3534,14 +3534,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(276),
-            target: TransformTarget::Callable(DeclarationId(1786)),
+            target: TransformTarget::Callable(DeclarationId(1793)),
             inputs: vec![],
             output: PortId(376),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24872, 24879),
         }));
         nodes.push(Behavior::Transform(TransformNode {
             id: NodeId(277),
-            target: TransformTarget::Callable(DeclarationId(1788)),
+            target: TransformTarget::Callable(DeclarationId(1795)),
             inputs: vec![PortId(375), PortId(376)],
             output: PortId(377),
             span: SourceSpan::new("src/v3/std/algebra.dag", 24860, 24901),
@@ -3559,7 +3559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
             id: NodeId(279),
             target: TransformTarget::FieldProject {
                 field_label: "nodes".to_string(),
-                field_child: Some(DeclarationId(1709)),
+                field_child: Some(DeclarationId(1716)),
             },
             inputs: vec![PortId(378)],
             output: PortId(379),
@@ -4127,7 +4127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec<Behavior> {
 #[allow(clippy::vec_init_then_push)]
 fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declaration> {
     {
-        let mut declarations = Vec::with_capacity(2273);
+        let mut declarations = Vec::with_capacity(2296);
         declarations.push(Declaration {
             id: DeclarationId(0),
             name: Some("Classical".to_string()),
@@ -16671,11 +16671,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Empty".to_string(),
-                        ty: DeclarationId(1528),
+                        ty: DeclarationId(1535),
                     },
                     Field {
                         label: "Cons".to_string(),
-                        ty: DeclarationId(1530),
+                        ty: DeclarationId(1537),
                     },
                 ],
             },
@@ -16708,7 +16708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("empty".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1498),
+                output: DeclarationId(1505),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)),
             },
             type_params: vec![DeclarationId(609)],
@@ -16739,8 +16739,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(610),
             name: Some("cons".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(611), DeclarationId(1499)],
-                output: DeclarationId(1500),
+                inputs: vec![DeclarationId(611), DeclarationId(1506)],
+                output: DeclarationId(1507),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)),
             },
             type_params: vec![DeclarationId(611)],
@@ -16772,7 +16772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("singleton".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(613)],
-                output: DeclarationId(1501),
+                output: DeclarationId(1508),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)),
             },
             type_params: vec![DeclarationId(613)],
@@ -16803,7 +16803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(614),
             name: Some("fold".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1502), DeclarationId(616), DeclarationId(1503)],
+                inputs: vec![DeclarationId(1509), DeclarationId(616), DeclarationId(1510)],
                 output: DeclarationId(616),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)),
             },
@@ -16849,7 +16849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(617),
             name: Some("fold_right".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1504), DeclarationId(619), DeclarationId(1505)],
+                inputs: vec![DeclarationId(1511), DeclarationId(619), DeclarationId(1512)],
                 output: DeclarationId(619),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)),
             },
@@ -16895,8 +16895,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(620),
             name: Some("concat".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1506), DeclarationId(1507)],
-                output: DeclarationId(1508),
+                inputs: vec![DeclarationId(1513), DeclarationId(1514)],
+                output: DeclarationId(1515),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)),
             },
             type_params: vec![DeclarationId(621)],
@@ -16927,8 +16927,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(622),
             name: Some("map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1509), DeclarationId(1510)],
-                output: DeclarationId(1511),
+                inputs: vec![DeclarationId(1516), DeclarationId(1517)],
+                output: DeclarationId(1518),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)),
             },
             type_params: vec![DeclarationId(623), DeclarationId(624)],
@@ -16973,8 +16973,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(625),
             name: Some("filter".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1512), DeclarationId(1513)],
-                output: DeclarationId(1514),
+                inputs: vec![DeclarationId(1519), DeclarationId(1520)],
+                output: DeclarationId(1521),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)),
             },
             type_params: vec![DeclarationId(626)],
@@ -17005,8 +17005,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(627),
             name: Some("flat_map".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1515), DeclarationId(1517)],
-                output: DeclarationId(1518),
+                inputs: vec![DeclarationId(1522), DeclarationId(1524)],
+                output: DeclarationId(1525),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)),
             },
             type_params: vec![DeclarationId(628), DeclarationId(629)],
@@ -17051,7 +17051,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(630),
             name: Some("length".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1519)],
+                inputs: vec![DeclarationId(1526)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)),
             },
@@ -17083,7 +17083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(632),
             name: Some("is_empty".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1520)],
+                inputs: vec![DeclarationId(1527)],
                 output: DeclarationId(100),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)),
             },
@@ -17154,8 +17154,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(636),
             name: Some("enumerate".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1521)],
-                output: DeclarationId(1523),
+                inputs: vec![DeclarationId(1528)],
+                output: DeclarationId(1530),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)),
             },
             type_params: vec![DeclarationId(637)],
@@ -17186,8 +17186,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(638),
             name: Some("enumerate_helper".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1524), DeclarationId(81)],
-                output: DeclarationId(1526),
+                inputs: vec![DeclarationId(1531), DeclarationId(81)],
+                output: DeclarationId(1533),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)),
             },
             type_params: vec![DeclarationId(639)],
@@ -17218,7 +17218,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(640),
             name: Some("contains".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1527), DeclarationId(641)],
+                inputs: vec![DeclarationId(1534), DeclarationId(641)],
                 output: DeclarationId(100),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)),
             },
@@ -17313,7 +17313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1531),
+                        ty: DeclarationId(1538),
                     },
                 ],
             },
@@ -17356,7 +17356,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "rest".to_string(),
-                        ty: DeclarationId(1532),
+                        ty: DeclarationId(1539),
                     },
                 ],
             },
@@ -17391,11 +17391,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LiteralToken".to_string(),
-                        ty: DeclarationId(1547),
+                        ty: DeclarationId(1554),
                     },
                     Field {
                         label: "ParamToken".to_string(),
-                        ty: DeclarationId(1548),
+                        ty: DeclarationId(1555),
                     },
                 ],
             },
@@ -17415,7 +17415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1549),
+                    ty: DeclarationId(1556),
                 }],
             },
             type_params: vec![],
@@ -17435,11 +17435,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedSegmentTokens".to_string(),
-                        ty: DeclarationId(1551),
+                        ty: DeclarationId(1558),
                     },
                     Field {
                         label: "MalformedPathSegment".to_string(),
-                        ty: DeclarationId(1552),
+                        ty: DeclarationId(1559),
                     },
                 ],
             },
@@ -17460,11 +17460,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParsedPathTemplate".to_string(),
-                        ty: DeclarationId(1553),
+                        ty: DeclarationId(1560),
                     },
                     Field {
                         label: "MalformedPathTemplate".to_string(),
-                        ty: DeclarationId(1554),
+                        ty: DeclarationId(1561),
                     },
                 ],
             },
@@ -17519,7 +17519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("last_path_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(651)],
-                output: DeclarationId(1533),
+                output: DeclarationId(1540),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)),
             },
             type_params: vec![],
@@ -17539,15 +17539,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ReadEffect".to_string(),
-                        ty: DeclarationId(1555),
+                        ty: DeclarationId(1562),
                     },
                     Field {
                         label: "UpsertEffect".to_string(),
-                        ty: DeclarationId(1556),
+                        ty: DeclarationId(1563),
                     },
                     Field {
                         label: "DeleteEffect".to_string(),
-                        ty: DeclarationId(1557),
+                        ty: DeclarationId(1564),
                     },
                 ],
             },
@@ -17568,11 +17568,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CreateEffect".to_string(),
-                        ty: DeclarationId(1558),
+                        ty: DeclarationId(1565),
                     },
                     Field {
                         label: "AppendEffect".to_string(),
-                        ty: DeclarationId(1559),
+                        ty: DeclarationId(1566),
                     },
                 ],
             },
@@ -17593,11 +17593,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IsIdempotent".to_string(),
-                        ty: DeclarationId(1560),
+                        ty: DeclarationId(1567),
                     },
                     Field {
                         label: "IsBreaking".to_string(),
-                        ty: DeclarationId(1561),
+                        ty: DeclarationId(1568),
                     },
                 ],
             },
@@ -17618,11 +17618,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PostAlways".to_string(),
-                        ty: DeclarationId(1562),
+                        ty: DeclarationId(1569),
                     },
                     Field {
                         label: "KeylessFallback".to_string(),
-                        ty: DeclarationId(1563),
+                        ty: DeclarationId(1570),
                     },
                 ],
             },
@@ -17643,15 +17643,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "PathParam".to_string(),
-                        ty: DeclarationId(1564),
+                        ty: DeclarationId(1571),
                     },
                     Field {
                         label: "InputField".to_string(),
-                        ty: DeclarationId(1565),
+                        ty: DeclarationId(1572),
                     },
                     Field {
                         label: "CompositeKey".to_string(),
-                        ty: DeclarationId(1567),
+                        ty: DeclarationId(1574),
                     },
                 ],
             },
@@ -17672,15 +17672,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LatticeEffect".to_string(),
-                        ty: DeclarationId(1568),
+                        ty: DeclarationId(1575),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1569),
+                        ty: DeclarationId(1576),
                     },
                     Field {
                         label: "NonIdempotent".to_string(),
-                        ty: DeclarationId(1570),
+                        ty: DeclarationId(1577),
                     },
                 ],
             },
@@ -17762,15 +17762,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DerivedEffect".to_string(),
-                        ty: DeclarationId(1571),
+                        ty: DeclarationId(1578),
                     },
                     Field {
                         label: "UnknownHttpMethodInput".to_string(),
-                        ty: DeclarationId(1572),
+                        ty: DeclarationId(1579),
                     },
                     Field {
                         label: "MalformedPathInput".to_string(),
-                        ty: DeclarationId(1573),
+                        ty: DeclarationId(1580),
                     },
                 ],
             },
@@ -17791,11 +17791,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IdempotentComposition".to_string(),
-                        ty: DeclarationId(1574),
+                        ty: DeclarationId(1581),
                     },
                     Field {
                         label: "BrokenBy".to_string(),
-                        ty: DeclarationId(1576),
+                        ty: DeclarationId(1583),
                     },
                 ],
             },
@@ -17832,7 +17832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(1534),
+                output: DeclarationId(1541),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)),
             },
             type_params: vec![],
@@ -17849,8 +17849,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(670),
             name: Some("indexed_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1535)],
-                output: DeclarationId(1537),
+                inputs: vec![DeclarationId(1542)],
+                output: DeclarationId(1544),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)),
             },
             type_params: vec![],
@@ -17867,8 +17867,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(671),
             name: Some("first_breaker_ref".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1538)],
-                output: DeclarationId(1540),
+                inputs: vec![DeclarationId(1545)],
+                output: DeclarationId(1547),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)),
             },
             type_params: vec![],
@@ -17885,7 +17885,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(672),
             name: Some("compose_effects".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1541)],
+                inputs: vec![DeclarationId(1548)],
                 output: DeclarationId(667),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)),
             },
@@ -17950,19 +17950,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LinearEffect".to_string(),
-                        ty: DeclarationId(1578),
+                        ty: DeclarationId(1585),
                     },
                     Field {
                         label: "BranchEffect".to_string(),
-                        ty: DeclarationId(1580),
+                        ty: DeclarationId(1587),
                     },
                     Field {
                         label: "LoopEffect".to_string(),
-                        ty: DeclarationId(1581),
+                        ty: DeclarationId(1588),
                     },
                     Field {
                         label: "ParallelEffect".to_string(),
-                        ty: DeclarationId(1583),
+                        ty: DeclarationId(1590),
                     },
                 ],
             },
@@ -18012,11 +18012,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WorkflowCompositionVerdict".to_string(),
-                        ty: DeclarationId(1584),
+                        ty: DeclarationId(1591),
                     },
                     Field {
                         label: "IdempotencyUnsupported".to_string(),
-                        ty: DeclarationId(1585),
+                        ty: DeclarationId(1592),
                     },
                 ],
             },
@@ -18055,23 +18055,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoWorkflowProjection".to_string(),
-                        ty: DeclarationId(1586),
+                        ty: DeclarationId(1593),
                     },
                     Field {
                         label: "NotParallelEffectRoot".to_string(),
-                        ty: DeclarationId(1587),
+                        ty: DeclarationId(1594),
                     },
                     Field {
                         label: "NonLinearParallelBranch".to_string(),
-                        ty: DeclarationId(1588),
+                        ty: DeclarationId(1595),
                     },
                     Field {
                         label: "PairwiseNonCommute".to_string(),
-                        ty: DeclarationId(1589),
+                        ty: DeclarationId(1596),
                     },
                     Field {
                         label: "LensSurfacePending".to_string(),
-                        ty: DeclarationId(1590),
+                        ty: DeclarationId(1597),
                     },
                 ],
             },
@@ -18121,11 +18121,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ParallelCompositionVerdict".to_string(),
-                        ty: DeclarationId(1591),
+                        ty: DeclarationId(1598),
                     },
                     Field {
                         label: "ParallelismUnsupported".to_string(),
-                        ty: DeclarationId(1592),
+                        ty: DeclarationId(1599),
                     },
                 ],
             },
@@ -18180,7 +18180,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("parse_http_method".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(1542),
+                output: DeclarationId(1549),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)),
             },
             type_params: vec![],
@@ -18215,7 +18215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(686),
             name: Some("upsert_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1543), DeclarationId(167)],
+                inputs: vec![DeclarationId(1550), DeclarationId(167)],
                 output: DeclarationId(659),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)),
             },
@@ -18233,7 +18233,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(687),
             name: Some("delete_or_create".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1544), DeclarationId(167)],
+                inputs: vec![DeclarationId(1551), DeclarationId(167)],
                 output: DeclarationId(659),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)),
             },
@@ -18290,15 +18290,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Agrees".to_string(),
-                        ty: DeclarationId(1593),
+                        ty: DeclarationId(1600),
                     },
                     Field {
                         label: "Disagrees".to_string(),
-                        ty: DeclarationId(1594),
+                        ty: DeclarationId(1601),
                     },
                     Field {
                         label: "DerivationUnknown".to_string(),
-                        ty: DeclarationId(1595),
+                        ty: DeclarationId(1602),
                     },
                 ],
             },
@@ -18319,11 +18319,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ModifierNotDeclared".to_string(),
-                        ty: DeclarationId(1596),
+                        ty: DeclarationId(1603),
                     },
                     Field {
                         label: "ModifierDeclared".to_string(),
-                        ty: DeclarationId(1597),
+                        ty: DeclarationId(1604),
                     },
                 ],
             },
@@ -18461,8 +18461,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(697),
             name: Some("generate_idempotency_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1545)],
-                output: DeclarationId(1546),
+                inputs: vec![DeclarationId(1552)],
+                output: DeclarationId(1553),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 37296, 37566)),
             },
             type_params: vec![],
@@ -18530,15 +18530,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Uninferred".to_string(),
-                        ty: DeclarationId(1605),
+                        ty: DeclarationId(1612),
                     },
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(1606),
+                        ty: DeclarationId(1613),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(1607),
+                        ty: DeclarationId(1614),
                     },
                 ],
             },
@@ -18567,7 +18567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "produced_by".to_string(),
-                        ty: DeclarationId(1608),
+                        ty: DeclarationId(1615),
                     },
                 ],
             },
@@ -18588,15 +18588,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LitInt".to_string(),
-                        ty: DeclarationId(1609),
+                        ty: DeclarationId(1616),
                     },
                     Field {
                         label: "LitBool".to_string(),
-                        ty: DeclarationId(1610),
+                        ty: DeclarationId(1617),
                     },
                     Field {
                         label: "LitString".to_string(),
-                        ty: DeclarationId(1611),
+                        ty: DeclarationId(1618),
                     },
                 ],
             },
@@ -18617,23 +18617,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1612),
+                        ty: DeclarationId(1619),
                     },
                     Field {
                         label: "UnresolvedIdentifier".to_string(),
-                        ty: DeclarationId(1613),
+                        ty: DeclarationId(1620),
                     },
                     Field {
                         label: "ResolvedByStructure".to_string(),
-                        ty: DeclarationId(1614),
+                        ty: DeclarationId(1621),
                     },
                     Field {
                         label: "ResolvedByName".to_string(),
-                        ty: DeclarationId(1615),
+                        ty: DeclarationId(1622),
                     },
                     Field {
                         label: "TypeParam".to_string(),
-                        ty: DeclarationId(1616),
+                        ty: DeclarationId(1623),
                     },
                 ],
             },
@@ -18654,15 +18654,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OneUnit".to_string(),
-                        ty: DeclarationId(1617),
+                        ty: DeclarationId(1624),
                     },
                     Field {
                         label: "AdditionalUnit".to_string(),
-                        ty: DeclarationId(1618),
+                        ty: DeclarationId(1625),
                     },
                     Field {
                         label: "UnitCount".to_string(),
-                        ty: DeclarationId(1619),
+                        ty: DeclarationId(1626),
                     },
                 ],
             },
@@ -18683,11 +18683,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ZeroWidth".to_string(),
-                        ty: DeclarationId(1620),
+                        ty: DeclarationId(1627),
                     },
                     Field {
                         label: "PositiveWidth".to_string(),
-                        ty: DeclarationId(1621),
+                        ty: DeclarationId(1628),
                     },
                 ],
             },
@@ -18708,11 +18708,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "BoundedInterval".to_string(),
-                        ty: DeclarationId(1622),
+                        ty: DeclarationId(1629),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1623),
+                        ty: DeclarationId(1630),
                     },
                 ],
             },
@@ -18767,11 +18767,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StaticBound".to_string(),
-                        ty: DeclarationId(1625),
+                        ty: DeclarationId(1632),
                     },
                     Field {
                         label: "PlatformDependent".to_string(),
-                        ty: DeclarationId(1626),
+                        ty: DeclarationId(1633),
                     },
                 ],
             },
@@ -18792,15 +18792,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Exact".to_string(),
-                        ty: DeclarationId(1627),
+                        ty: DeclarationId(1634),
                     },
                     Field {
                         label: "AtMostOne".to_string(),
-                        ty: DeclarationId(1628),
+                        ty: DeclarationId(1635),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1629),
+                        ty: DeclarationId(1636),
                     },
                 ],
             },
@@ -18896,27 +18896,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Literal".to_string(),
-                        ty: DeclarationId(1630),
+                        ty: DeclarationId(1637),
                     },
                     Field {
                         label: "Reference".to_string(),
-                        ty: DeclarationId(1631),
+                        ty: DeclarationId(1638),
                     },
                     Field {
                         label: "Record".to_string(),
-                        ty: DeclarationId(1633),
+                        ty: DeclarationId(1640),
                     },
                     Field {
                         label: "List".to_string(),
-                        ty: DeclarationId(1635),
+                        ty: DeclarationId(1642),
                     },
                     Field {
                         label: "Map".to_string(),
-                        ty: DeclarationId(1637),
+                        ty: DeclarationId(1644),
                     },
                     Field {
                         label: "Variant".to_string(),
-                        ty: DeclarationId(1639),
+                        ty: DeclarationId(1646),
                     },
                 ],
             },
@@ -18937,15 +18937,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueBodyUnparsed".to_string(),
-                        ty: DeclarationId(1640),
+                        ty: DeclarationId(1647),
                     },
                     Field {
                         label: "ValueBodyStructural".to_string(),
-                        ty: DeclarationId(1642),
+                        ty: DeclarationId(1649),
                     },
                     Field {
                         label: "ValueBodyMap".to_string(),
-                        ty: DeclarationId(1644),
+                        ty: DeclarationId(1651),
                     },
                 ],
             },
@@ -18985,23 +18985,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserDefined".to_string(),
-                        ty: DeclarationId(1645),
+                        ty: DeclarationId(1652),
                     },
                     Field {
                         label: "ExternalRealization".to_string(),
-                        ty: DeclarationId(1646),
+                        ty: DeclarationId(1653),
                     },
                     Field {
                         label: "Pending".to_string(),
-                        ty: DeclarationId(1647),
+                        ty: DeclarationId(1654),
                     },
                     Field {
                         label: "NoBody".to_string(),
-                        ty: DeclarationId(1648),
+                        ty: DeclarationId(1655),
                     },
                     Field {
                         label: "Unparsed".to_string(),
-                        ty: DeclarationId(1649),
+                        ty: DeclarationId(1656),
                     },
                 ],
             },
@@ -19022,27 +19022,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Atom".to_string(),
-                        ty: DeclarationId(1650),
+                        ty: DeclarationId(1657),
                     },
                     Field {
                         label: "Conj".to_string(),
-                        ty: DeclarationId(1652),
+                        ty: DeclarationId(1659),
                     },
                     Field {
                         label: "Disj".to_string(),
-                        ty: DeclarationId(1654),
+                        ty: DeclarationId(1661),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(1656),
+                        ty: DeclarationId(1663),
                     },
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1657),
+                        ty: DeclarationId(1664),
                     },
                     Field {
                         label: "Instantiation".to_string(),
-                        ty: DeclarationId(1659),
+                        ty: DeclarationId(1666),
                     },
                 ],
             },
@@ -19067,7 +19067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "name".to_string(),
-                        ty: DeclarationId(1660),
+                        ty: DeclarationId(1667),
                     },
                     Field {
                         label: "connective".to_string(),
@@ -19075,27 +19075,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "type_params".to_string(),
-                        ty: DeclarationId(1661),
+                        ty: DeclarationId(1668),
                     },
                     Field {
                         label: "phantom_params".to_string(),
-                        ty: DeclarationId(1662),
+                        ty: DeclarationId(1669),
                     },
                     Field {
                         label: "meta_tag".to_string(),
-                        ty: DeclarationId(1663),
+                        ty: DeclarationId(1670),
                     },
                     Field {
                         label: "inhabits".to_string(),
-                        ty: DeclarationId(1664),
+                        ty: DeclarationId(1671),
                     },
                     Field {
                         label: "value_body".to_string(),
-                        ty: DeclarationId(1665),
+                        ty: DeclarationId(1672),
                     },
                     Field {
                         label: "nominal_opacity".to_string(),
-                        ty: DeclarationId(1666),
+                        ty: DeclarationId(1673),
                     },
                     Field {
                         label: "span".to_string(),
@@ -19144,7 +19144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "permitted_accessors".to_string(),
-                    ty: DeclarationId(1667),
+                    ty: DeclarationId(1674),
                 }],
             },
             type_params: vec![],
@@ -19164,19 +19164,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Add".to_string(),
-                        ty: DeclarationId(1668),
+                        ty: DeclarationId(1675),
                     },
                     Field {
                         label: "Sub".to_string(),
-                        ty: DeclarationId(1669),
+                        ty: DeclarationId(1676),
                     },
                     Field {
                         label: "Mul".to_string(),
-                        ty: DeclarationId(1670),
+                        ty: DeclarationId(1677),
                     },
                     Field {
                         label: "Div".to_string(),
-                        ty: DeclarationId(1671),
+                        ty: DeclarationId(1678),
                     },
                 ],
             },
@@ -19197,27 +19197,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(1672),
+                        ty: DeclarationId(1679),
                     },
                     Field {
                         label: "Ne".to_string(),
-                        ty: DeclarationId(1673),
+                        ty: DeclarationId(1680),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(1674),
+                        ty: DeclarationId(1681),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(1675),
+                        ty: DeclarationId(1682),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(1676),
+                        ty: DeclarationId(1683),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(1677),
+                        ty: DeclarationId(1684),
                     },
                 ],
             },
@@ -19238,11 +19238,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "And".to_string(),
-                        ty: DeclarationId(1678),
+                        ty: DeclarationId(1685),
                     },
                     Field {
                         label: "Or".to_string(),
-                        ty: DeclarationId(1679),
+                        ty: DeclarationId(1686),
                     },
                 ],
             },
@@ -19263,15 +19263,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Arithmetic".to_string(),
-                        ty: DeclarationId(1680),
+                        ty: DeclarationId(1687),
                     },
                     Field {
                         label: "Comparison".to_string(),
-                        ty: DeclarationId(1681),
+                        ty: DeclarationId(1688),
                     },
                     Field {
                         label: "Logical".to_string(),
-                        ty: DeclarationId(1682),
+                        ty: DeclarationId(1689),
                     },
                 ],
             },
@@ -19292,15 +19292,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Callable".to_string(),
-                        ty: DeclarationId(1683),
+                        ty: DeclarationId(1690),
                     },
                     Field {
                         label: "FieldProject".to_string(),
-                        ty: DeclarationId(1685),
+                        ty: DeclarationId(1692),
                     },
                     Field {
                         label: "Operator".to_string(),
-                        ty: DeclarationId(1686),
+                        ty: DeclarationId(1693),
                     },
                 ],
             },
@@ -19321,11 +19321,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnresolvedVariant".to_string(),
-                        ty: DeclarationId(1687),
+                        ty: DeclarationId(1694),
                     },
                     Field {
                         label: "ResolvedVariant".to_string(),
-                        ty: DeclarationId(1688),
+                        ty: DeclarationId(1695),
                     },
                 ],
             },
@@ -19383,7 +19383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "binding".to_string(),
-                        ty: DeclarationId(1689),
+                        ty: DeclarationId(1696),
                     },
                 ],
             },
@@ -19519,11 +19519,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "members".to_string(),
-                        ty: DeclarationId(1690),
+                        ty: DeclarationId(1697),
                     },
                     Field {
                         label: "intra_cluster_calls".to_string(),
-                        ty: DeclarationId(1691),
+                        ty: DeclarationId(1698),
                     },
                 ],
             },
@@ -19544,11 +19544,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Cardinality".to_string(),
-                        ty: DeclarationId(1692),
+                        ty: DeclarationId(1699),
                     },
                     Field {
                         label: "Descent".to_string(),
-                        ty: DeclarationId(1693),
+                        ty: DeclarationId(1700),
                     },
                 ],
             },
@@ -19603,7 +19603,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1694),
+                        ty: DeclarationId(1701),
                     },
                 ],
             },
@@ -19632,7 +19632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1695),
+                        ty: DeclarationId(1702),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -19660,7 +19660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserMatch".to_string(),
-                    ty: DeclarationId(1696),
+                    ty: DeclarationId(1703),
                 }],
             },
             type_params: vec![],
@@ -19688,7 +19688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "paths".to_string(),
-                        ty: DeclarationId(1697),
+                        ty: DeclarationId(1704),
                     },
                     Field {
                         label: "result_port".to_string(),
@@ -19700,7 +19700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1698),
+                        ty: DeclarationId(1705),
                     },
                 ],
             },
@@ -19765,7 +19765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "UserCallable".to_string(),
-                    ty: DeclarationId(1699),
+                    ty: DeclarationId(1706),
                 }],
             },
             type_params: vec![],
@@ -19797,7 +19797,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "params".to_string(),
-                        ty: DeclarationId(1700),
+                        ty: DeclarationId(1707),
                     },
                     Field {
                         label: "span".to_string(),
@@ -19805,11 +19805,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "lane2_workflow".to_string(),
-                        ty: DeclarationId(1701),
+                        ty: DeclarationId(1708),
                     },
                     Field {
                         label: "emit_participation".to_string(),
-                        ty: DeclarationId(1702),
+                        ty: DeclarationId(1709),
                     },
                 ],
             },
@@ -19830,23 +19830,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Value".to_string(),
-                        ty: DeclarationId(1703),
+                        ty: DeclarationId(1710),
                     },
                     Field {
                         label: "Transform".to_string(),
-                        ty: DeclarationId(1704),
+                        ty: DeclarationId(1711),
                     },
                     Field {
                         label: "Branch".to_string(),
-                        ty: DeclarationId(1705),
+                        ty: DeclarationId(1712),
                     },
                     Field {
                         label: "Loop".to_string(),
-                        ty: DeclarationId(1706),
+                        ty: DeclarationId(1713),
                     },
                     Field {
                         label: "Bind".to_string(),
-                        ty: DeclarationId(1707),
+                        ty: DeclarationId(1714),
                     },
                 ],
             },
@@ -19867,19 +19867,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "declarations".to_string(),
-                        ty: DeclarationId(1708),
+                        ty: DeclarationId(1715),
                     },
                     Field {
                         label: "nodes".to_string(),
-                        ty: DeclarationId(1709),
+                        ty: DeclarationId(1716),
                     },
                     Field {
                         label: "ports".to_string(),
-                        ty: DeclarationId(1710),
+                        ty: DeclarationId(1717),
                     },
                     Field {
                         label: "clusters".to_string(),
-                        ty: DeclarationId(1711),
+                        ty: DeclarationId(1718),
                     },
                 ],
             },
@@ -19919,15 +19919,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "accessor".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -19946,7 +19946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("port".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(643)],
-                output: DeclarationId(1598),
+                output: DeclarationId(1605),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     19522,
@@ -19968,7 +19968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("node".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(642)],
-                output: DeclarationId(1599),
+                output: DeclarationId(1606),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     19580,
@@ -19990,7 +19990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("resolve_producer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(643)],
-                output: DeclarationId(1600),
+                output: DeclarationId(1607),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     19655,
@@ -20012,7 +20012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("declaration_by_id".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(644)],
-                output: DeclarationId(1601),
+                output: DeclarationId(1608),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     20044,
@@ -20034,7 +20034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("lane2_workflow_at".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(642)],
-                output: DeclarationId(1602),
+                output: DeclarationId(1609),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     20368,
@@ -20058,15 +20058,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "SingleRoot".to_string(),
-                        ty: DeclarationId(1712),
+                        ty: DeclarationId(1719),
                     },
                     Field {
                         label: "NoRoot".to_string(),
-                        ty: DeclarationId(1713),
+                        ty: DeclarationId(1720),
                     },
                     Field {
                         label: "AmbiguousRoot".to_string(),
-                        ty: DeclarationId(1715),
+                        ty: DeclarationId(1722),
                     },
                 ],
             },
@@ -20107,7 +20107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("miss_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1603),
+                output: DeclarationId(1610),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24373,
@@ -20129,7 +20129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("hit_declaration_id_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(644)],
-                output: DeclarationId(1604),
+                output: DeclarationId(1611),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/substrate.dag",
                     24458,
@@ -20152,7 +20152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1105),
+                    ty: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -20172,15 +20172,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShrinkEffect".to_string(),
-                        ty: DeclarationId(1740),
+                        ty: DeclarationId(1747),
                     },
                     Field {
                         label: "ProjectionEffect".to_string(),
-                        ty: DeclarationId(1741),
+                        ty: DeclarationId(1748),
                     },
                     Field {
                         label: "IdentityEffect".to_string(),
-                        ty: DeclarationId(1742),
+                        ty: DeclarationId(1749),
                     },
                 ],
             },
@@ -20201,19 +20201,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ShapeConstant".to_string(),
-                        ty: DeclarationId(1743),
+                        ty: DeclarationId(1750),
                     },
                     Field {
                         label: "ShapeLinearScan".to_string(),
-                        ty: DeclarationId(1744),
+                        ty: DeclarationId(1751),
                     },
                     Field {
                         label: "ShapeIterateBody".to_string(),
-                        ty: DeclarationId(1745),
+                        ty: DeclarationId(1752),
                     },
                     Field {
                         label: "ShapeSortBody".to_string(),
-                        ty: DeclarationId(1746),
+                        ty: DeclarationId(1753),
                     },
                 ],
             },
@@ -20242,15 +20242,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "size_effect".to_string(),
-                        ty: DeclarationId(1747),
+                        ty: DeclarationId(1754),
                     },
                     Field {
                         label: "cost_shape".to_string(),
-                        ty: DeclarationId(1748),
+                        ty: DeclarationId(1755),
                     },
                     Field {
                         label: "callback_element_position".to_string(),
-                        ty: DeclarationId(1749),
+                        ty: DeclarationId(1756),
                     },
                 ],
             },
@@ -20290,11 +20290,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "DegreeTwo".to_string(),
-                        ty: DeclarationId(1750),
+                        ty: DeclarationId(1757),
                     },
                     Field {
                         label: "DegreeSuccessor".to_string(),
-                        ty: DeclarationId(1751),
+                        ty: DeclarationId(1758),
                     },
                 ],
             },
@@ -20315,31 +20315,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ConstantCost".to_string(),
-                        ty: DeclarationId(1752),
+                        ty: DeclarationId(1759),
                     },
                     Field {
                         label: "LinearCost".to_string(),
-                        ty: DeclarationId(1753),
+                        ty: DeclarationId(1760),
                     },
                     Field {
                         label: "PolynomialCost".to_string(),
-                        ty: DeclarationId(1754),
+                        ty: DeclarationId(1761),
                     },
                     Field {
                         label: "ProductCost".to_string(),
-                        ty: DeclarationId(1756),
+                        ty: DeclarationId(1763),
                     },
                     Field {
                         label: "SumCost".to_string(),
-                        ty: DeclarationId(1758),
+                        ty: DeclarationId(1765),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(1759),
+                        ty: DeclarationId(1766),
                     },
                     Field {
                         label: "UnknownCost".to_string(),
-                        ty: DeclarationId(1760),
+                        ty: DeclarationId(1767),
                     },
                 ],
             },
@@ -20347,7 +20347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
-            inhabits: Some(DeclarationId(1761)),
+            inhabits: Some(DeclarationId(1768)),
             value_body: None,
             refinement: None,
             nominal_opacity: None,
@@ -20401,7 +20401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("miss_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(1716),
+                output: DeclarationId(1723),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10771, 10781)),
             },
             type_params: vec![],
@@ -20419,7 +20419,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("hit_symbolic_cost_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(765)],
-                output: DeclarationId(1717),
+                output: DeclarationId(1724),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10855, 10870)),
             },
             type_params: vec![],
@@ -20437,7 +20437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("two_terms".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(765), DeclarationId(765)],
-                output: DeclarationId(1718),
+                output: DeclarationId(1725),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(10))),
             },
             type_params: vec![],
@@ -20454,8 +20454,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(771),
             name: Some("many_terms".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(765), DeclarationId(765), DeclarationId(1719)],
-                output: DeclarationId(1720),
+                inputs: vec![DeclarationId(765), DeclarationId(765), DeclarationId(1726)],
+                output: DeclarationId(1727),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(12))),
             },
             type_params: vec![],
@@ -20580,7 +20580,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(778),
             name: Some("max_path".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1721)],
+                inputs: vec![DeclarationId(1728)],
                 output: DeclarationId(765),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(45))),
             },
@@ -20652,8 +20652,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(782),
             name: Some("nsl_to_list".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1722)],
-                output: DeclarationId(1723),
+                inputs: vec![DeclarationId(1729)],
+                output: DeclarationId(1730),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(117))),
             },
             type_params: vec![],
@@ -20670,8 +20670,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(783),
             name: Some("drop_additive_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1724)],
-                output: DeclarationId(1725),
+                inputs: vec![DeclarationId(1731)],
+                output: DeclarationId(1732),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(130))),
             },
             type_params: vec![],
@@ -20688,8 +20688,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(784),
             name: Some("collapse_on_multiplicative_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1726)],
-                output: DeclarationId(1727),
+                inputs: vec![DeclarationId(1733)],
+                output: DeclarationId(1734),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(137))),
             },
             type_params: vec![],
@@ -20706,7 +20706,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(785),
             name: Some("any_zero".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1728)],
+                inputs: vec![DeclarationId(1735)],
                 output: DeclarationId(100),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(146))),
             },
@@ -20724,8 +20724,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(786),
             name: Some("drop_multiplicative_one".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1729)],
-                output: DeclarationId(1730),
+                inputs: vec![DeclarationId(1736)],
+                output: DeclarationId(1737),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(159))),
             },
             type_params: vec![],
@@ -20778,7 +20778,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(789),
             name: Some("reduce_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1731)],
+                inputs: vec![DeclarationId(1738)],
                 output: DeclarationId(765),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(191))),
             },
@@ -20796,7 +20796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(790),
             name: Some("wrap_sum".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1732)],
+                inputs: vec![DeclarationId(1739)],
                 output: DeclarationId(765),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(203))),
             },
@@ -20814,7 +20814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(791),
             name: Some("reduce_product".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1733)],
+                inputs: vec![DeclarationId(1740)],
                 output: DeclarationId(765),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))),
             },
@@ -20963,8 +20963,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(799),
             name: Some("filter_not_dominated_by".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1734), DeclarationId(765)],
-                output: DeclarationId(1735),
+                inputs: vec![DeclarationId(1741), DeclarationId(765)],
+                output: DeclarationId(1742),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(268))),
             },
             type_params: vec![],
@@ -20981,8 +20981,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(800),
             name: Some("drop_dominated_step".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1736), DeclarationId(765)],
-                output: DeclarationId(1737),
+                inputs: vec![DeclarationId(1743), DeclarationId(765)],
+                output: DeclarationId(1744),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(275))),
             },
             type_params: vec![],
@@ -20999,8 +20999,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(801),
             name: Some("drop_dominated".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1738)],
-                output: DeclarationId(1739),
+                inputs: vec![DeclarationId(1745)],
+                output: DeclarationId(1746),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(278))),
             },
             type_params: vec![],
@@ -21020,10 +21020,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 inputs: vec![
                     DeclarationId(119),
                     DeclarationId(197),
-                    DeclarationId(1789),
+                    DeclarationId(1796),
                     DeclarationId(81),
-                    DeclarationId(1790),
-                    DeclarationId(1791),
+                    DeclarationId(1797),
+                    DeclarationId(1798),
                 ],
                 output: DeclarationId(814),
                 body: ArrowBody::Unparsed(SourceSpan::new(
@@ -21049,12 +21049,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1051),
+                    value: DeclarationId(1058),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1792)),
+            meta_tag: Some(DeclarationId(1799)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![])),
@@ -21069,11 +21069,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserMessage".to_string(),
-                        ty: DeclarationId(1794),
+                        ty: DeclarationId(1801),
                     },
                     Field {
                         label: "AssistantMessage".to_string(),
-                        ty: DeclarationId(1796),
+                        ty: DeclarationId(1803),
                     },
                 ],
             },
@@ -21094,11 +21094,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Base64Image".to_string(),
-                        ty: DeclarationId(1797),
+                        ty: DeclarationId(1804),
                     },
                     Field {
                         label: "UrlImage".to_string(),
-                        ty: DeclarationId(1798),
+                        ty: DeclarationId(1805),
                     },
                 ],
             },
@@ -21119,11 +21119,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TextContent".to_string(),
-                        ty: DeclarationId(1799),
+                        ty: DeclarationId(1806),
                     },
                     Field {
                         label: "ImageContent".to_string(),
-                        ty: DeclarationId(1800),
+                        ty: DeclarationId(1807),
                     },
                 ],
             },
@@ -21144,11 +21144,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ToolResultText".to_string(),
-                        ty: DeclarationId(1801),
+                        ty: DeclarationId(1808),
                     },
                     Field {
                         label: "ToolResultBlocks".to_string(),
-                        ty: DeclarationId(1803),
+                        ty: DeclarationId(1810),
                     },
                 ],
             },
@@ -21169,11 +21169,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UserTextBlock".to_string(),
-                        ty: DeclarationId(1804),
+                        ty: DeclarationId(1811),
                     },
                     Field {
                         label: "UserToolResultBlock".to_string(),
-                        ty: DeclarationId(1807),
+                        ty: DeclarationId(1814),
                     },
                 ],
             },
@@ -21194,11 +21194,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AssistantTextBlock".to_string(),
-                        ty: DeclarationId(1808),
+                        ty: DeclarationId(1815),
                     },
                     Field {
                         label: "AssistantToolUseBlock".to_string(),
-                        ty: DeclarationId(1809),
+                        ty: DeclarationId(1816),
                     },
                 ],
             },
@@ -21219,31 +21219,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EndTurn".to_string(),
-                        ty: DeclarationId(1810),
+                        ty: DeclarationId(1817),
                     },
                     Field {
                         label: "MaxTokens".to_string(),
-                        ty: DeclarationId(1811),
+                        ty: DeclarationId(1818),
                     },
                     Field {
                         label: "StopSequence".to_string(),
-                        ty: DeclarationId(1812),
+                        ty: DeclarationId(1819),
                     },
                     Field {
                         label: "ToolUse".to_string(),
-                        ty: DeclarationId(1813),
+                        ty: DeclarationId(1820),
                     },
                     Field {
                         label: "PauseTurn".to_string(),
-                        ty: DeclarationId(1814),
+                        ty: DeclarationId(1821),
                     },
                     Field {
                         label: "Refusal".to_string(),
-                        ty: DeclarationId(1815),
+                        ty: DeclarationId(1822),
                     },
                     Field {
                         label: "ModelContextWindowExceeded".to_string(),
-                        ty: DeclarationId(1816),
+                        ty: DeclarationId(1823),
                     },
                 ],
             },
@@ -21264,23 +21264,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CharLocation".to_string(),
-                        ty: DeclarationId(1819),
+                        ty: DeclarationId(1826),
                     },
                     Field {
                         label: "PageLocation".to_string(),
-                        ty: DeclarationId(1822),
+                        ty: DeclarationId(1829),
                     },
                     Field {
                         label: "ContentBlockLocation".to_string(),
-                        ty: DeclarationId(1825),
+                        ty: DeclarationId(1832),
                     },
                     Field {
                         label: "WebSearchResultLocation".to_string(),
-                        ty: DeclarationId(1827),
+                        ty: DeclarationId(1834),
                     },
                     Field {
                         label: "SearchResultLocation".to_string(),
-                        ty: DeclarationId(1829),
+                        ty: DeclarationId(1836),
                     },
                 ],
             },
@@ -21309,7 +21309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "citations".to_string(),
-                        ty: DeclarationId(1831),
+                        ty: DeclarationId(1838),
                     },
                 ],
             },
@@ -21338,15 +21338,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "cache_creation_input_tokens".to_string(),
-                        ty: DeclarationId(1832),
+                        ty: DeclarationId(1839),
                     },
                     Field {
                         label: "cache_read_input_tokens".to_string(),
-                        ty: DeclarationId(1833),
+                        ty: DeclarationId(1840),
                     },
                     Field {
                         label: "service_tier".to_string(),
-                        ty: DeclarationId(1834),
+                        ty: DeclarationId(1841),
                     },
                 ],
             },
@@ -21379,7 +21379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1835),
+                        ty: DeclarationId(1842),
                     },
                     Field {
                         label: "model".to_string(),
@@ -21391,7 +21391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "stop_sequence".to_string(),
-                        ty: DeclarationId(1836),
+                        ty: DeclarationId(1843),
                     },
                     Field {
                         label: "usage".to_string(),
@@ -21399,7 +21399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "container".to_string(),
-                        ty: DeclarationId(1837),
+                        ty: DeclarationId(1844),
                     },
                 ],
             },
@@ -21420,23 +21420,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ToNearestEven".to_string(),
-                        ty: DeclarationId(1838),
+                        ty: DeclarationId(1845),
                     },
                     Field {
                         label: "ToZero".to_string(),
-                        ty: DeclarationId(1839),
+                        ty: DeclarationId(1846),
                     },
                     Field {
                         label: "ToPositiveInfinity".to_string(),
-                        ty: DeclarationId(1840),
+                        ty: DeclarationId(1847),
                     },
                     Field {
                         label: "ToNegativeInfinity".to_string(),
-                        ty: DeclarationId(1841),
+                        ty: DeclarationId(1848),
                     },
                     Field {
                         label: "ToAwayFromZero".to_string(),
-                        ty: DeclarationId(1842),
+                        ty: DeclarationId(1849),
                     },
                 ],
             },
@@ -21457,15 +21457,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1843),
+                        ty: DeclarationId(1850),
                     },
                     Field {
                         label: "BinaryPrecision".to_string(),
-                        ty: DeclarationId(1844),
+                        ty: DeclarationId(1851),
                     },
                     Field {
                         label: "DecimalPrecision".to_string(),
-                        ty: DeclarationId(1845),
+                        ty: DeclarationId(1852),
                     },
                 ],
             },
@@ -21486,15 +21486,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoNaN".to_string(),
-                        ty: DeclarationId(1846),
+                        ty: DeclarationId(1853),
                     },
                     Field {
                         label: "QuietNaN".to_string(),
-                        ty: DeclarationId(1847),
+                        ty: DeclarationId(1854),
                     },
                     Field {
                         label: "QuietAndSignalingNaN".to_string(),
-                        ty: DeclarationId(1848),
+                        ty: DeclarationId(1855),
                     },
                 ],
             },
@@ -21515,11 +21515,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoInfinity".to_string(),
-                        ty: DeclarationId(1849),
+                        ty: DeclarationId(1856),
                     },
                     Field {
                         label: "SignedInfinity".to_string(),
-                        ty: DeclarationId(1850),
+                        ty: DeclarationId(1857),
                     },
                 ],
             },
@@ -21540,11 +21540,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoSignedZero".to_string(),
-                        ty: DeclarationId(1851),
+                        ty: DeclarationId(1858),
                     },
                     Field {
                         label: "SignedZero".to_string(),
-                        ty: DeclarationId(1852),
+                        ty: DeclarationId(1859),
                     },
                 ],
             },
@@ -21565,15 +21565,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "NoSubnormals".to_string(),
-                        ty: DeclarationId(1853),
+                        ty: DeclarationId(1860),
                     },
                     Field {
                         label: "GradualUnderflow".to_string(),
-                        ty: DeclarationId(1854),
+                        ty: DeclarationId(1861),
                     },
                     Field {
                         label: "FlushToZero".to_string(),
-                        ty: DeclarationId(1855),
+                        ty: DeclarationId(1862),
                     },
                 ],
             },
@@ -21623,7 +21623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(1856),
+                        ty: DeclarationId(1863),
                     },
                     Field {
                         label: "rounding".to_string(),
@@ -21682,7 +21682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "entry".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -21703,23 +21703,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "StdAuthority".to_string(),
-                        ty: DeclarationId(1857),
+                        ty: DeclarationId(1864),
                     },
                     Field {
                         label: "V3StdAuthority".to_string(),
-                        ty: DeclarationId(1858),
+                        ty: DeclarationId(1865),
                     },
                     Field {
                         label: "V3SpecAuthority".to_string(),
-                        ty: DeclarationId(1859),
+                        ty: DeclarationId(1866),
                     },
                     Field {
                         label: "CompilerAuthority".to_string(),
-                        ty: DeclarationId(1860),
+                        ty: DeclarationId(1867),
                     },
                     Field {
                         label: "ExtdepsFixtureAuthority".to_string(),
-                        ty: DeclarationId(1861),
+                        ty: DeclarationId(1868),
                     },
                 ],
             },
@@ -21776,399 +21776,406 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "dsl/std/logic.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/bit.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/error_primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/magnitude.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/nat.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/integer.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/rational.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/float.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/types.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/string_type.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/unicode.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/render_repeat_string_bootstrap.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1857),
+                            constructor: DeclarationId(1864),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/algebra.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_messages.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_operations.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/anthropic_schema.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/approximate_field.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bin_shim.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bootstrap_authority.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/bridge_ledger.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/clean_emission.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/computation_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
+                            payload: vec![],
+                        },
+                    ),
+                    (
+                        "src/v3/std/cross_target_coverage.dag".to_string(),
+                        FieldValue::Variant {
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/diagnostics.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/dimensions.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/effects.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/emit_model.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/go_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/induction.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/integer_diagnostic_order.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lens.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/list.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/lookup.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/methods.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/parse_surface.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/python_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/resources.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/runtime.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/rust_method_template_contracts.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/services.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/substrate_minimal.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/termination.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/tokenize.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/verification.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/std/workflows.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1858),
+                            constructor: DeclarationId(1865),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/v3_l1.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1859),
+                            constructor: DeclarationId(1866),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/go.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1859),
+                            constructor: DeclarationId(1866),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/python.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1859),
+                            constructor: DeclarationId(1866),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/spec/rust.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1859),
+                            constructor: DeclarationId(1866),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/pipeline.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1860),
+                            constructor: DeclarationId(1867),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/operators.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1860),
+                            constructor: DeclarationId(1867),
                             payload: vec![],
                         },
                     ),
                     (
                         "src/v3/compiler/regen.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1860),
+                            constructor: DeclarationId(1867),
                             payload: vec![],
                         },
                     ),
                     (
                         "dsl/extdeps/languages/rust/primitives.dag".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1861),
+                            constructor: DeclarationId(1868),
                             payload: vec![],
                         },
                     ),
@@ -22177,7 +22184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             )),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4240),
+            span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4300),
         });
         declarations.push(Declaration {
             id: DeclarationId(828),
@@ -22186,11 +22193,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Retired".to_string(),
-                        ty: DeclarationId(1862),
+                        ty: DeclarationId(1869),
                     },
                     Field {
                         label: "Open".to_string(),
-                        ty: DeclarationId(1863),
+                        ty: DeclarationId(1870),
                     },
                 ],
             },
@@ -22210,7 +22217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1105),
+                    ty: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -22256,7 +22263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5984, 6094),
         });
-        declarations.push(Declaration { id: DeclarationId(831), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(606), arguments: vec![TemplateArgument { parameter: DeclarationId(607), value: DeclarationId(830) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1864)), 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(1863), 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(1862), 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(1862), 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(1863), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1863), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1863), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) });
+        declarations.push(Declaration { id: DeclarationId(831), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(606), arguments: vec![TemplateArgument { parameter: DeclarationId(607), value: DeclarationId(830) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1871)), 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(1870), 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(1869), 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(1869), 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(1870), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1870), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1870), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) });
         declarations.push(Declaration {
             id: DeclarationId(832),
             name: Some("CleanEmissionContract".to_string()),
@@ -22317,7 +22324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(943),
+                        ty: DeclarationId(950),
                     },
                     Field {
                         label: "clean_emission".to_string(),
@@ -22342,15 +22349,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapEverything".to_string(),
-                        ty: DeclarationId(1865),
+                        ty: DeclarationId(1872),
                     },
                     Field {
                         label: "WrapOnlyInOperandPosition".to_string(),
-                        ty: DeclarationId(1866),
+                        ty: DeclarationId(1873),
                     },
                     Field {
                         label: "NoWrapping".to_string(),
-                        ty: DeclarationId(1867),
+                        ty: DeclarationId(1874),
                     },
                 ],
             },
@@ -22371,19 +22378,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EmitBindingAlways".to_string(),
-                        ty: DeclarationId(1868),
+                        ty: DeclarationId(1875),
                     },
                     Field {
                         label: "EmitUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1869),
+                        ty: DeclarationId(1876),
                     },
                     Field {
                         label: "EmitPrefixedUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1870),
+                        ty: DeclarationId(1877),
                     },
                     Field {
                         label: "NotApplicablePatternBinding".to_string(),
-                        ty: DeclarationId(1871),
+                        ty: DeclarationId(1878),
                     },
                 ],
             },
@@ -22404,11 +22411,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "AccessFromPayloadBinding".to_string(),
-                        ty: DeclarationId(1872),
+                        ty: DeclarationId(1879),
                     },
                     Field {
                         label: "OverrideNamedFieldsAtBindingSite".to_string(),
-                        ty: DeclarationId(1873),
+                        ty: DeclarationId(1880),
                     },
                 ],
             },
@@ -22429,15 +22436,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ImportEverythingDeclared".to_string(),
-                        ty: DeclarationId(1874),
+                        ty: DeclarationId(1881),
                     },
                     Field {
                         label: "IncludeOnlyReferenced".to_string(),
-                        ty: DeclarationId(1875),
+                        ty: DeclarationId(1882),
                     },
                     Field {
                         label: "ImportPerUsageSite".to_string(),
-                        ty: DeclarationId(1876),
+                        ty: DeclarationId(1883),
                     },
                 ],
             },
@@ -22458,15 +22465,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapReturnValue".to_string(),
-                        ty: DeclarationId(1877),
+                        ty: DeclarationId(1884),
                     },
                     Field {
                         label: "NoWrappingOnTerminalExpression".to_string(),
-                        ty: DeclarationId(1878),
+                        ty: DeclarationId(1885),
                     },
                     Field {
                         label: "ExplicitReturnKeyword".to_string(),
-                        ty: DeclarationId(1879),
+                        ty: DeclarationId(1886),
                     },
                 ],
             },
@@ -22487,15 +22494,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "EmitLetBindingAlways".to_string(),
-                        ty: DeclarationId(1880),
+                        ty: DeclarationId(1887),
                     },
                     Field {
                         label: "EmitLetUnderscoreWhenUnused".to_string(),
-                        ty: DeclarationId(1881),
+                        ty: DeclarationId(1888),
                     },
                     Field {
                         label: "OmitLetBinding".to_string(),
-                        ty: DeclarationId(1882),
+                        ty: DeclarationId(1889),
                     },
                 ],
             },
@@ -22516,15 +22523,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "WrapBody".to_string(),
-                        ty: DeclarationId(1883),
+                        ty: DeclarationId(1890),
                     },
                     Field {
                         label: "NoWrappingOnNonComplexBody".to_string(),
-                        ty: DeclarationId(1884),
+                        ty: DeclarationId(1891),
                     },
                     Field {
                         label: "NotApplicableMatchArmBody".to_string(),
-                        ty: DeclarationId(1885),
+                        ty: DeclarationId(1892),
                     },
                 ],
             },
@@ -22582,7 +22589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(1886),
+                        ty: DeclarationId(1893),
                     },
                     Field {
                         label: "syntax_only".to_string(),
@@ -22615,19 +22622,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "IgnoreVerifierOutput".to_string(),
-                        ty: DeclarationId(1887),
+                        ty: DeclarationId(1894),
                     },
                     Field {
                         label: "RequireEmptyStdout".to_string(),
-                        ty: DeclarationId(1888),
+                        ty: DeclarationId(1895),
                     },
                     Field {
                         label: "RequireEmptyStderr".to_string(),
-                        ty: DeclarationId(1889),
+                        ty: DeclarationId(1896),
                     },
                     Field {
                         label: "RequireEmptyStdoutAndStderr".to_string(),
-                        ty: DeclarationId(1890),
+                        ty: DeclarationId(1897),
                     },
                 ],
             },
@@ -22648,35 +22655,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "CollectionSize".to_string(),
-                        ty: DeclarationId(1895),
+                        ty: DeclarationId(1902),
                     },
                     Field {
                         label: "ParserStreamSize".to_string(),
-                        ty: DeclarationId(1896),
+                        ty: DeclarationId(1903),
                     },
                     Field {
                         label: "WorklistDrainSize".to_string(),
-                        ty: DeclarationId(1897),
+                        ty: DeclarationId(1904),
                     },
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(1898),
+                        ty: DeclarationId(1905),
                     },
                     Field {
                         label: "ArithmeticParam".to_string(),
-                        ty: DeclarationId(1899),
+                        ty: DeclarationId(1906),
                     },
                     Field {
                         label: "ExplicitCountZero".to_string(),
-                        ty: DeclarationId(1900),
+                        ty: DeclarationId(1907),
                     },
                     Field {
                         label: "ExplicitCountPositive".to_string(),
-                        ty: DeclarationId(1901),
+                        ty: DeclarationId(1908),
                     },
                     Field {
                         label: "Forever".to_string(),
-                        ty: DeclarationId(1902),
+                        ty: DeclarationId(1909),
                     },
                 ],
             },
@@ -22716,7 +22723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             id: DeclarationId(846),
             name: Some("positive_descent_count".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1060)],
+                inputs: vec![DeclarationId(1067)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
@@ -22741,35 +22748,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ChildAccessorCall".to_string(),
-                        ty: DeclarationId(1903),
+                        ty: DeclarationId(1910),
                     },
                     Field {
                         label: "CollectionShrinkCall".to_string(),
-                        ty: DeclarationId(1904),
+                        ty: DeclarationId(1911),
                     },
                     Field {
                         label: "ArithmeticSubtractCall".to_string(),
-                        ty: DeclarationId(1905),
+                        ty: DeclarationId(1912),
                     },
                     Field {
                         label: "ArithmeticDivideCall".to_string(),
-                        ty: DeclarationId(1906),
+                        ty: DeclarationId(1913),
                     },
                     Field {
                         label: "ParserAdvanceCall".to_string(),
-                        ty: DeclarationId(1907),
+                        ty: DeclarationId(1914),
                     },
                     Field {
                         label: "WorklistDrainCall".to_string(),
-                        ty: DeclarationId(1908),
+                        ty: DeclarationId(1915),
                     },
                     Field {
                         label: "FoldBodyCall".to_string(),
-                        ty: DeclarationId(1909),
+                        ty: DeclarationId(1916),
                     },
                     Field {
                         label: "SameArgumentCall".to_string(),
-                        ty: DeclarationId(1910),
+                        ty: DeclarationId(1917),
                     },
                 ],
             },
@@ -22790,15 +22797,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "UnitShrink".to_string(),
-                        ty: DeclarationId(1911),
+                        ty: DeclarationId(1918),
                     },
                     Field {
                         label: "ConstantShrink".to_string(),
-                        ty: DeclarationId(1912),
+                        ty: DeclarationId(1919),
                     },
                     Field {
                         label: "ProportionalShrink".to_string(),
-                        ty: DeclarationId(1913),
+                        ty: DeclarationId(1920),
                     },
                 ],
             },
@@ -22819,15 +22826,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Fold".to_string(),
-                        ty: DeclarationId(1914),
+                        ty: DeclarationId(1921),
                     },
                     Field {
                         label: "Descend".to_string(),
-                        ty: DeclarationId(1915),
+                        ty: DeclarationId(1922),
                     },
                     Field {
                         label: "Repeat".to_string(),
-                        ty: DeclarationId(1916),
+                        ty: DeclarationId(1923),
                     },
                 ],
             },
@@ -22856,11 +22863,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(1052),
+                        ty: DeclarationId(1059),
                     },
                     Field {
                         label: "factor".to_string(),
-                        ty: DeclarationId(1917),
+                        ty: DeclarationId(1924),
                     },
                 ],
             },
@@ -22901,7 +22908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("size_bound_param".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(844)],
-                output: DeclarationId(1891),
+                output: DeclarationId(1898),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     5369,
@@ -22967,7 +22974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("constant_bound_value".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(844)],
-                output: DeclarationId(1892),
+                output: DeclarationId(1899),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     6297,
@@ -22991,15 +22998,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "TreeDescent".to_string(),
-                        ty: DeclarationId(1918),
+                        ty: DeclarationId(1925),
                     },
                     Field {
                         label: "CollectionFold".to_string(),
-                        ty: DeclarationId(1919),
+                        ty: DeclarationId(1926),
                     },
                     Field {
                         label: "ArithmeticRepeat".to_string(),
-                        ty: DeclarationId(1920),
+                        ty: DeclarationId(1927),
                     },
                 ],
             },
@@ -23018,7 +23025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("algebra_profile_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(53)],
-                output: DeclarationId(1893),
+                output: DeclarationId(1900),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7370,
@@ -23040,7 +23047,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             name: Some("type_iteration_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(1894),
+                output: DeclarationId(1901),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/computation.dag",
                     7935,
@@ -23064,11 +23071,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Immutable".to_string(),
-                        ty: DeclarationId(1921),
+                        ty: DeclarationId(1928),
                     },
                     Field {
                         label: "Mutable".to_string(),
-                        ty: DeclarationId(1922),
+                        ty: DeclarationId(1929),
                     },
                 ],
             },
@@ -23089,11 +23096,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Pure".to_string(),
-                        ty: DeclarationId(1923),
+                        ty: DeclarationId(1930),
                     },
                     Field {
                         label: "Effectful".to_string(),
-                        ty: DeclarationId(1924),
+                        ty: DeclarationId(1931),
                     },
                 ],
             },
@@ -23114,11 +23121,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ExplicitDAG".to_string(),
-                        ty: DeclarationId(1925),
+                        ty: DeclarationId(1932),
                     },
                     Field {
                         label: "Arbitrary".to_string(),
-                        ty: DeclarationId(1926),
+                        ty: DeclarationId(1933),
                     },
                 ],
             },
@@ -23139,11 +23146,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "Bounded".to_string(),
-                        ty: DeclarationId(1927),
+                        ty: DeclarationId(1934),
                     },
                     Field {
                         label: "Unbounded".to_string(),
-                        ty: DeclarationId(1928),
+                        ty: DeclarationId(1935),
                     },
                 ],
             },
@@ -23207,28 +23214,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "mutability".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1921),
+                            constructor: DeclarationId(1928),
                             payload: vec![],
                         },
                     ),
                     (
                         "purity".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1923),
+                            constructor: DeclarationId(1930),
                             payload: vec![],
                         },
                     ),
                     (
                         "structure".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1925),
+                            constructor: DeclarationId(1932),
                             payload: vec![],
                         },
                     ),
                     (
                         "iteration".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1927),
+                            constructor: DeclarationId(1934),
                             payload: vec![],
                         },
                     ),
@@ -23245,19 +23252,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "ValueOnly".to_string(),
-                        ty: DeclarationId(1929),
+                        ty: DeclarationId(1936),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1930),
+                        ty: DeclarationId(1937),
                     },
                     Field {
                         label: "RefCounted".to_string(),
-                        ty: DeclarationId(1931),
+                        ty: DeclarationId(1938),
                     },
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1932),
+                        ty: DeclarationId(1939),
                     },
                 ],
             },
@@ -23278,11 +23285,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "LexicalScoping".to_string(),
-                        ty: DeclarationId(1933),
+                        ty: DeclarationId(1940),
                     },
                     Field {
                         label: "DynamicScoping".to_string(),
-                        ty: DeclarationId(1934),
+                        ty: DeclarationId(1941),
                     },
                 ],
             },
@@ -23327,7 +23334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "excluded_prefixes".to_string(),
-                    ty: DeclarationId(1935),
+                    ty: DeclarationId(1942),
                 }],
             },
             type_params: vec![],
@@ -23351,7 +23358,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "additional_excluded_prefixes".to_string(),
-                        ty: DeclarationId(1936),
+                        ty: DeclarationId(1943),
                     },
                 ],
             },
@@ -23399,11 +23406,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 variants: vec![
                     Field {
                         label: "OwnershipBased".to_string(),
-                        ty: DeclarationId(1937),
+                        ty: DeclarationId(1944),
                     },
                     Field {
                         label: "GarbageCollected".to_string(),
-                        ty: DeclarationId(1938),
+                        ty: DeclarationId(1945),
                     },
                 ],
             },
@@ -23419,48 +23426,250 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
         });
         declarations.push(Declaration {
             id: DeclarationId(872),
+            name: Some("ShapeATarget".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Rust".to_string(),
+                        ty: DeclarationId(1946),
+                    },
+                    Field {
+                        label: "Python".to_string(),
+                        ty: DeclarationId(1947),
+                    },
+                    Field {
+                        label: "Go".to_string(),
+                        ty: DeclarationId(1948),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5382, 5420),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(873),
+            name: Some("FormAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Atom".to_string(),
+                        ty: DeclarationId(1949),
+                    },
+                    Field {
+                        label: "Conj".to_string(),
+                        ty: DeclarationId(1950),
+                    },
+                    Field {
+                        label: "Disj".to_string(),
+                        ty: DeclarationId(1951),
+                    },
+                    Field {
+                        label: "Arrow".to_string(),
+                        ty: DeclarationId(1952),
+                    },
+                    Field {
+                        label: "Cardinality".to_string(),
+                        ty: DeclarationId(1953),
+                    },
+                    Field {
+                        label: "Instantiation".to_string(),
+                        ty: DeclarationId(1954),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6220, 6292),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(874),
+            name: Some("BehaviorAxis".to_string()),
+            connective: TypeConnective::Disj {
+                variants: vec![
+                    Field {
+                        label: "Value".to_string(),
+                        ty: DeclarationId(1955),
+                    },
+                    Field {
+                        label: "Transform".to_string(),
+                        ty: DeclarationId(1956),
+                    },
+                    Field {
+                        label: "Branch".to_string(),
+                        ty: DeclarationId(1957),
+                    },
+                    Field {
+                        label: "Loop".to_string(),
+                        ty: DeclarationId(1958),
+                    },
+                    Field {
+                        label: "Bind".to_string(),
+                        ty: DeclarationId(1959),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6852, 6912),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(875),
+            name: Some("MethodTemplateContractKey".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "target".to_string(),
+                        ty: DeclarationId(872),
+                    },
+                    Field {
+                        label: "dag_method".to_string(),
+                        ty: DeclarationId(759),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7296, 7377),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(876),
+            name: Some("EmissionCell".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "connective".to_string(),
+                        ty: DeclarationId(873),
+                    },
+                    Field {
+                        label: "behavior".to_string(),
+                        ty: DeclarationId(874),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 7810, 7879),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(877),
+            name: Some("EmissionPathProjection".to_string()),
+            connective: TypeConnective::Conj {
+                children: vec![
+                    Field {
+                        label: "row_identity".to_string(),
+                        ty: DeclarationId(875),
+                    },
+                    Field {
+                        label: "cells".to_string(),
+                        ty: DeclarationId(1960),
+                    },
+                ],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8225, 8326),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(878),
+            name: Some("emission_path_projections".to_string()),
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(606),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(607),
+                    value: DeclarationId(877),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: Some(DeclarationId(1961)),
+            specialization_parent: None,
+            inhabits: None,
+            value_body: Some(ValueBody::List(vec![])),
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8688, 8753),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(879),
             name: Some("CompilerDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(1939),
+                        ty: DeclarationId(1962),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(1940),
+                        ty: DeclarationId(1963),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(1941),
+                        ty: DeclarationId(1964),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(1942),
+                        ty: DeclarationId(1965),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(1943),
+                        ty: DeclarationId(1966),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(1944),
+                        ty: DeclarationId(1967),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(1945),
+                        ty: DeclarationId(1968),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(1946),
+                        ty: DeclarationId(1969),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(1947),
+                        ty: DeclarationId(1970),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(1948),
+                        ty: DeclarationId(1971),
                     },
                 ],
             },
@@ -23475,7 +23684,7 @@ 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(873),
+            id: DeclarationId(880),
             name: Some("Correction".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23504,7 +23713,7 @@ 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(874),
+            id: DeclarationId(881),
             name: Some("DiagnosticKindDecl".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23529,12 +23738,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(875),
+            id: DeclarationId(882),
             name: Some("LensInstanceKindWitness".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "kind_decl".to_string(),
-                    ty: DeclarationId(1105),
+                    ty: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -23548,17 +23757,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(876),
+            id: DeclarationId(883),
             name: Some("AnyDiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CompilerKind".to_string(),
-                        ty: DeclarationId(1949),
+                        ty: DeclarationId(1972),
                     },
                     Field {
                         label: "LensInstanceKind".to_string(),
-                        ty: DeclarationId(1950),
+                        ty: DeclarationId(1973),
                     },
                 ],
             },
@@ -23573,13 +23782,13 @@ 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(877),
+            id: DeclarationId(884),
             name: Some("Diagnostic".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(876),
+                        ty: DeclarationId(883),
                     },
                     Field {
                         label: "span".to_string(),
@@ -23591,7 +23800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fixes".to_string(),
-                        ty: DeclarationId(1951),
+                        ty: DeclarationId(1974),
                     },
                 ],
             },
@@ -23606,37 +23815,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(878),
+            id: DeclarationId(885),
             name: Some("EmissionDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "UnderRefined".to_string(),
-                        ty: DeclarationId(1952),
+                        ty: DeclarationId(1975),
                     },
                     Field {
                         label: "NoInhabitant".to_string(),
-                        ty: DeclarationId(1953),
+                        ty: DeclarationId(1976),
                     },
                     Field {
                         label: "ContradictoryUse".to_string(),
-                        ty: DeclarationId(1955),
+                        ty: DeclarationId(1978),
                     },
                     Field {
                         label: "OutOfR2Scope".to_string(),
-                        ty: DeclarationId(1956),
+                        ty: DeclarationId(1979),
                     },
                     Field {
                         label: "LifetimeProgramExtractionPending".to_string(),
-                        ty: DeclarationId(1957),
+                        ty: DeclarationId(1980),
                     },
                     Field {
                         label: "FoldNotImplemented".to_string(),
-                        ty: DeclarationId(1958),
+                        ty: DeclarationId(1981),
                     },
                     Field {
                         label: "MissingEmissionPath".to_string(),
-                        ty: DeclarationId(1959),
+                        ty: DeclarationId(1982),
                     },
                 ],
             },
@@ -23651,21 +23860,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(879),
+            id: DeclarationId(886),
             name: Some("Witness".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Inhabits".to_string(),
-                        ty: DeclarationId(1974),
+                        ty: DeclarationId(1997),
                     },
                     Field {
                         label: "Violates".to_string(),
-                        ty: DeclarationId(1975),
+                        ty: DeclarationId(1998),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(880)],
+            type_params: vec![DeclarationId(887)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -23676,7 +23885,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(880),
+            id: DeclarationId(887),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -23690,17 +23899,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(881),
+            id: DeclarationId(888),
             name: Some("OptionalDiagnostic".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "NoDiagnostic".to_string(),
-                        ty: DeclarationId(1976),
+                        ty: DeclarationId(1999),
                     },
                     Field {
                         label: "SomeDiagnostic".to_string(),
-                        ty: DeclarationId(1977),
+                        ty: DeclarationId(2000),
                     },
                 ],
             },
@@ -23715,21 +23924,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(882),
+            id: DeclarationId(889),
             name: Some("DimensionReport".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DimensionOk".to_string(),
-                        ty: DeclarationId(1980),
+                        ty: DeclarationId(2003),
                     },
                     Field {
                         label: "DimensionFail".to_string(),
-                        ty: DeclarationId(1984),
+                        ty: DeclarationId(2007),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(883)],
+            type_params: vec![DeclarationId(890)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -23740,7 +23949,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(883),
+            id: DeclarationId(890),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -23754,7 +23963,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(884),
+            id: DeclarationId(891),
             name: Some("AnalysisDimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -23764,19 +23973,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "witness_of".to_string(),
-                        ty: DeclarationId(1986),
+                        ty: DeclarationId(2009),
                     },
                     Field {
                         label: "compose".to_string(),
-                        ty: DeclarationId(1987),
+                        ty: DeclarationId(2010),
                     },
                     Field {
                         label: "break_diagnostic".to_string(),
-                        ty: DeclarationId(1988),
+                        ty: DeclarationId(2011),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(885)],
+            type_params: vec![DeclarationId(892)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -23787,7 +23996,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(885),
+            id: DeclarationId(892),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -23801,18 +24010,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(886),
+            id: DeclarationId(893),
             name: Some("Dimension".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(888),
+                    ty: DeclarationId(895),
                 }],
             },
-            type_params: vec![DeclarationId(887), DeclarationId(888)],
+            type_params: vec![DeclarationId(894), DeclarationId(895)],
             phantom_params: vec![PhantomParameter {
-                parameter: DeclarationId(887),
-                algebra: DeclarationId(1989),
+                parameter: DeclarationId(894),
+                algebra: DeclarationId(2012),
             }],
             meta_tag: None,
             specialization_parent: None,
@@ -23823,7 +24032,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(887),
+            id: DeclarationId(894),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -23837,7 +24046,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(888),
+            id: DeclarationId(895),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -23851,7 +24060,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(889),
+            id: DeclarationId(896),
             name: Some("Meters".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23865,7 +24074,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(890),
+            id: DeclarationId(897),
             name: Some("Seconds".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23879,7 +24088,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(891),
+            id: DeclarationId(898),
             name: Some("Kilograms".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23893,7 +24102,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(892),
+            id: DeclarationId(899),
             name: Some("Amperes".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23907,7 +24116,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(893),
+            id: DeclarationId(900),
             name: Some("Kelvin".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23921,7 +24130,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(894),
+            id: DeclarationId(901),
             name: Some("Moles".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23935,7 +24144,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(895),
+            id: DeclarationId(902),
             name: Some("Candela".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -23949,18 +24158,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(896),
+            id: DeclarationId(903),
             name: Some("add_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1960),
-                    DeclarationId(1961),
-                    DeclarationId(1962),
+                    DeclarationId(1983),
+                    DeclarationId(1984),
+                    DeclarationId(1985),
                 ],
-                output: DeclarationId(1963),
+                output: DeclarationId(1986),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)),
             },
-            type_params: vec![DeclarationId(897), DeclarationId(898)],
+            type_params: vec![DeclarationId(904), DeclarationId(905)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -23971,7 +24180,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(897),
+            id: DeclarationId(904),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -23985,7 +24194,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(898),
+            id: DeclarationId(905),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -23999,18 +24208,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(899),
+            id: DeclarationId(906),
             name: Some("sub_dimension".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
-                    DeclarationId(1964),
-                    DeclarationId(1965),
-                    DeclarationId(1966),
+                    DeclarationId(1987),
+                    DeclarationId(1988),
+                    DeclarationId(1989),
                 ],
-                output: DeclarationId(1967),
+                output: DeclarationId(1990),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)),
             },
-            type_params: vec![DeclarationId(900), DeclarationId(901)],
+            type_params: vec![DeclarationId(907), DeclarationId(908)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -24021,7 +24230,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(900),
+            id: DeclarationId(907),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -24035,7 +24244,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(901),
+            id: DeclarationId(908),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -24049,14 +24258,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(902),
+            id: DeclarationId(909),
             name: Some("mul_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1968), DeclarationId(1969), DeclarationId(904)],
-                output: DeclarationId(1970),
+                inputs: vec![DeclarationId(1991), DeclarationId(1992), DeclarationId(911)],
+                output: DeclarationId(1993),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)),
             },
-            type_params: vec![DeclarationId(903), DeclarationId(904)],
+            type_params: vec![DeclarationId(910), DeclarationId(911)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -24067,7 +24276,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(903),
+            id: DeclarationId(910),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -24081,7 +24290,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(904),
+            id: DeclarationId(911),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -24095,14 +24304,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(905),
+            id: DeclarationId(912),
             name: Some("div_dimension_scalar".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1971), DeclarationId(1972), DeclarationId(907)],
-                output: DeclarationId(1973),
+                inputs: vec![DeclarationId(1994), DeclarationId(1995), DeclarationId(914)],
+                output: DeclarationId(1996),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)),
             },
-            type_params: vec![DeclarationId(906), DeclarationId(907)],
+            type_params: vec![DeclarationId(913), DeclarationId(914)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -24113,7 +24322,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(906),
+            id: DeclarationId(913),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())),
             type_params: vec![],
@@ -24127,7 +24336,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(907),
+            id: DeclarationId(914),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -24141,17 +24350,17 @@ 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(908),
+            id: DeclarationId(915),
             name: Some("TypeRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -24163,7 +24372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "fields".to_string(),
-                        ty: DeclarationId(1990),
+                        ty: DeclarationId(2013),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24182,29 +24391,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(909),
+            id: DeclarationId(916),
             name: Some("TargetIntegerTypeInhabitance".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "kernel_integer".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "bound".to_string(),
-                        ty: DeclarationId(910),
+                        ty: DeclarationId(917),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -24219,17 +24428,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 2521, 2718),
         });
         declarations.push(Declaration {
-            id: DeclarationId(910),
+            id: DeclarationId(917),
             name: Some("TargetIntegerInhabitanceBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BoundUnspecified".to_string(),
-                        ty: DeclarationId(1991),
+                        ty: DeclarationId(2014),
                     },
                     Field {
                         label: "StaticBoundFact".to_string(),
-                        ty: DeclarationId(1992),
+                        ty: DeclarationId(2015),
                     },
                 ],
             },
@@ -24244,7 +24453,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4149, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(911),
+            id: DeclarationId(918),
             name: Some("FieldBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24254,7 +24463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "access".to_string(),
-                        ty: DeclarationId(912),
+                        ty: DeclarationId(919),
                     },
                     Field {
                         label: "borrowed_read".to_string(),
@@ -24273,17 +24482,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4239, 4323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(912),
+            id: DeclarationId(919),
             name: Some("FieldAccess".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectField".to_string(),
-                        ty: DeclarationId(1993),
+                        ty: DeclarationId(2016),
                     },
                     Field {
                         label: "AccessorMethod".to_string(),
-                        ty: DeclarationId(1994),
+                        ty: DeclarationId(2017),
                     },
                 ],
             },
@@ -24298,21 +24507,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4706, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(913),
+            id: DeclarationId(920),
             name: Some("OperatorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "op".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -24335,17 +24544,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4775, 4906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(914),
+            id: DeclarationId(921),
             name: Some("BehaviorRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -24368,25 +24577,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4908, 5018),
         });
         declarations.push(Declaration {
-            id: DeclarationId(915),
+            id: DeclarationId(922),
             name: Some("CallableRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(924),
+                        ty: DeclarationId(931),
                     },
                     Field {
                         label: "parameters".to_string(),
-                        ty: DeclarationId(1995),
+                        ty: DeclarationId(2018),
                     },
                     Field {
                         label: "cost".to_string(),
@@ -24405,7 +24614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5020, 5179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(916),
+            id: DeclarationId(923),
             name: Some("CallableParameter".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24415,7 +24624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "disposition".to_string(),
-                        ty: DeclarationId(917),
+                        ty: DeclarationId(924),
                     },
                 ],
             },
@@ -24430,17 +24639,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5601, 5675),
         });
         declarations.push(Declaration {
-            id: DeclarationId(917),
+            id: DeclarationId(924),
             name: Some("ParameterDisposition".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1996),
+                        ty: DeclarationId(2019),
                     },
                     Field {
                         label: "Consumed".to_string(),
-                        ty: DeclarationId(1997),
+                        ty: DeclarationId(2020),
                     },
                 ],
             },
@@ -24455,17 +24664,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6132, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(918),
+            id: DeclarationId(925),
             name: Some("StringOwnershipAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Owned".to_string(),
-                        ty: DeclarationId(1998),
+                        ty: DeclarationId(2021),
                     },
                     Field {
                         label: "Borrowed".to_string(),
-                        ty: DeclarationId(1999),
+                        ty: DeclarationId(2022),
                     },
                 ],
             },
@@ -24480,17 +24689,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6595, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(919),
+            id: DeclarationId(926),
             name: Some("StringLifetimeAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SelfContained".to_string(),
-                        ty: DeclarationId(2000),
+                        ty: DeclarationId(2023),
                     },
                     Field {
                         label: "Caller".to_string(),
-                        ty: DeclarationId(2001),
+                        ty: DeclarationId(2024),
                     },
                 ],
             },
@@ -24505,21 +24714,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6950, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(920),
+            id: DeclarationId(927),
             name: Some("StringGrowabilityAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Growable".to_string(),
-                        ty: DeclarationId(2002),
+                        ty: DeclarationId(2025),
                     },
                     Field {
                         label: "Fixed".to_string(),
-                        ty: DeclarationId(2003),
+                        ty: DeclarationId(2026),
                     },
                     Field {
                         label: "NotApplicable".to_string(),
-                        ty: DeclarationId(2004),
+                        ty: DeclarationId(2027),
                     },
                 ],
             },
@@ -24534,12 +24743,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7229, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(921),
+            id: DeclarationId(928),
             name: Some("StringEncodingAxis".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "Utf8FreeMonoidChar".to_string(),
-                    ty: DeclarationId(2005),
+                    ty: DeclarationId(2028),
                 }],
             },
             type_params: vec![],
@@ -24553,37 +24762,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7605, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(922),
+            id: DeclarationId(929),
             name: Some("StringFamilyInhabitanceRow".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "target_type".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "type_realization".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "ownership".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "lifetime".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "growability".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "encoding".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -24598,17 +24807,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8235, 8474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(923),
+            id: DeclarationId(930),
             name: Some("TypeInstantiationRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "carrier".to_string(),
@@ -24631,49 +24840,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 8476, 8595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(924),
+            id: DeclarationId(931),
             name: Some("CallableStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ListEmpty".to_string(),
-                        ty: DeclarationId(2006),
+                        ty: DeclarationId(2029),
                     },
                     Field {
                         label: "ListSingleton".to_string(),
-                        ty: DeclarationId(2007),
+                        ty: DeclarationId(2030),
                     },
                     Field {
                         label: "ListCons".to_string(),
-                        ty: DeclarationId(2008),
+                        ty: DeclarationId(2031),
                     },
                     Field {
                         label: "ListConcat".to_string(),
-                        ty: DeclarationId(2009),
+                        ty: DeclarationId(2032),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2010),
+                        ty: DeclarationId(2033),
                     },
                     Field {
                         label: "ListIsEmpty".to_string(),
-                        ty: DeclarationId(2011),
+                        ty: DeclarationId(2034),
                     },
                     Field {
                         label: "ListFold".to_string(),
-                        ty: DeclarationId(2012),
+                        ty: DeclarationId(2035),
                     },
                     Field {
                         label: "ListMap".to_string(),
-                        ty: DeclarationId(2013),
+                        ty: DeclarationId(2036),
                     },
                     Field {
                         label: "ListFilter".to_string(),
-                        ty: DeclarationId(2014),
+                        ty: DeclarationId(2037),
                     },
                     Field {
                         label: "ListContains".to_string(),
-                        ty: DeclarationId(2015),
+                        ty: DeclarationId(2038),
                     },
                 ],
             },
@@ -24688,29 +24897,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9000, 9169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(925),
+            id: DeclarationId(932),
             name: Some("PatternRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "language".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "target".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(926),
+                        ty: DeclarationId(933),
                     },
                     Field {
                         label: "empty_variant".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "cons_variant".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "scrutinee".to_string(),
@@ -24749,17 +24958,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11108, 11397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(926),
+            id: DeclarationId(933),
             name: Some("PatternStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PlaceholderPatternStrategy".to_string(),
-                        ty: DeclarationId(2016),
+                        ty: DeclarationId(2039),
                     },
                     Field {
                         label: "VectorList".to_string(),
-                        ty: DeclarationId(2017),
+                        ty: DeclarationId(2040),
                     },
                 ],
             },
@@ -24774,7 +24983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11837, 11903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(927),
+            id: DeclarationId(934),
             name: Some("StatementSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24799,7 +25008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11905, 11982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(928),
+            id: DeclarationId(935),
             name: Some("ExpressionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24828,7 +25037,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11984, 12074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(929),
+            id: DeclarationId(936),
             name: Some("ForEachSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24853,7 +25062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12076, 12135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(930),
+            id: DeclarationId(937),
             name: Some("ControlFlowSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24867,7 +25076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "for_each_syntax".to_string(),
-                        ty: DeclarationId(929),
+                        ty: DeclarationId(936),
                     },
                 ],
             },
@@ -24882,7 +25091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12137, 12234),
         });
         declarations.push(Declaration {
-            id: DeclarationId(931),
+            id: DeclarationId(938),
             name: Some("LiteralSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24911,7 +25120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12236, 12332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(932),
+            id: DeclarationId(939),
             name: Some("ModuleSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -24930,7 +25139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12334, 12380),
         });
         declarations.push(Declaration {
-            id: DeclarationId(933),
+            id: DeclarationId(940),
             name: Some("FunctionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -24967,7 +25176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12382, 12534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(934),
+            id: DeclarationId(941),
             name: Some("TypeApplicationSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -24986,7 +25195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12536, 12585),
         });
         declarations.push(Declaration {
-            id: DeclarationId(935),
+            id: DeclarationId(942),
             name: Some("TypeDefinitionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25023,7 +25232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 12799, 12947),
         });
         declarations.push(Declaration {
-            id: DeclarationId(936),
+            id: DeclarationId(943),
             name: Some("RecordDeriveTemplateBundle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25048,7 +25257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 13608, 13701),
         });
         declarations.push(Declaration {
-            id: DeclarationId(937),
+            id: DeclarationId(944),
             name: Some("PatternMatchSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25097,45 +25306,45 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14405, 14645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(938),
+            id: DeclarationId(945),
             name: Some("CollectionOps".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "concat_contract".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "length_contract".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "is_empty_contract".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "fold_contract".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "filter_contract".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "flat_map_contract".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "any_contract".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "all_contract".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "map_contract".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "filter".to_string(),
@@ -25170,7 +25379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 14647, 15883),
         });
         declarations.push(Declaration {
-            id: DeclarationId(939),
+            id: DeclarationId(946),
             name: Some("ValueConstructionSyntax".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25207,17 +25416,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 15885, 16071),
         });
         declarations.push(Declaration {
-            id: DeclarationId(940),
+            id: DeclarationId(947),
             name: Some("RenderingModel".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(941),
+                        ty: DeclarationId(948),
                     },
                     Field {
                         label: "construct".to_string(),
-                        ty: DeclarationId(942),
+                        ty: DeclarationId(949),
                     },
                 ],
             },
@@ -25232,17 +25441,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16073, 16148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(941),
+            id: DeclarationId(948),
             name: Some("ReadStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Borrow".to_string(),
-                        ty: DeclarationId(2018),
+                        ty: DeclarationId(2041),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2019),
+                        ty: DeclarationId(2042),
                     },
                 ],
             },
@@ -25257,17 +25466,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16646, 16690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(942),
+            id: DeclarationId(949),
             name: Some("ConstructStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "CopyOrClone".to_string(),
-                        ty: DeclarationId(2020),
+                        ty: DeclarationId(2043),
                     },
                     Field {
                         label: "PassByValue".to_string(),
-                        ty: DeclarationId(2021),
+                        ty: DeclarationId(2044),
                     },
                 ],
             },
@@ -25282,57 +25491,57 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16983, 17037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(943),
+            id: DeclarationId(950),
             name: Some("LanguageSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "statements".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "expressions".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "control_flow".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "literals".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "modules".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "functions".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "type_applications".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "type_definitions".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "record_derive_templates".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "patterns".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "collection_ops".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "values".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -25347,17 +25556,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17039, 17565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(944),
+            id: DeclarationId(951),
             name: Some("PlaceholderConvention".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IndexedArgs".to_string(),
-                        ty: DeclarationId(2022),
+                        ty: DeclarationId(2045),
                     },
                     Field {
                         label: "NamedArg".to_string(),
-                        ty: DeclarationId(2023),
+                        ty: DeclarationId(2046),
                     },
                 ],
             },
@@ -25372,17 +25581,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18939, 18994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(945),
+            id: DeclarationId(952),
             name: Some("MethodEmitTemplate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SingleTemplate".to_string(),
-                        ty: DeclarationId(2024),
+                        ty: DeclarationId(2047),
                     },
                     Field {
                         label: "HigherOrderTemplates".to_string(),
-                        ty: DeclarationId(2025),
+                        ty: DeclarationId(2048),
                     },
                 ],
             },
@@ -25397,7 +25606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20129, 20285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(946),
+            id: DeclarationId(953),
             name: Some("MethodTemplateContract".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -25411,7 +25620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "emit_template".to_string(),
-                        ty: DeclarationId(945),
+                        ty: DeclarationId(952),
                     },
                     Field {
                         label: "wraps_result".to_string(),
@@ -25419,7 +25628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "placeholder_convention".to_string(),
-                        ty: DeclarationId(944),
+                        ty: DeclarationId(951),
                     },
                 ],
             },
@@ -25434,7 +25643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 22078, 22265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(947),
+            id: DeclarationId(954),
             name: Some("BootstrapFixture".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -25453,29 +25662,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(948),
+            id: DeclarationId(955),
             name: Some("BootstrapFixtureSet".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "rust_pilot_primitives".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(954),
                     },
                     Field {
                         label: "rust_method_template_contracts".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(954),
                     },
                     Field {
                         label: "python_method_template_contracts".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(954),
                     },
                     Field {
                         label: "go_method_template_contracts".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(954),
                     },
                     Field {
                         label: "anthropic_operations".to_string(),
-                        ty: DeclarationId(947),
+                        ty: DeclarationId(954),
+                    },
+                    Field {
+                        label: "cross_target_coverage".to_string(),
+                        ty: DeclarationId(954),
                     },
                 ],
             },
@@ -25487,18 +25700,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             value_body: None,
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 1864),
+            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 1906),
         });
         declarations.push(Declaration {
-            id: DeclarationId(949),
+            id: DeclarationId(956),
             name: Some("bootstrap_fixture_authority".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(948),
+                template: DeclarationId(955),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(948)),
+            meta_tag: Some(DeclarationId(955)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25548,22 +25761,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             )),
                         )]),
                     ),
+                    (
+                        "cross_target_coverage".to_string(),
+                        FieldValue::Record(vec![(
+                            "virtual_path".to_string(),
+                            FieldValue::Literal(LiteralBits::String(
+                                "src/v3/std/cross_target_coverage.dag".to_string(),
+                            )),
+                        )]),
+                    ),
                 ],
             }),
             refinement: None,
             nominal_opacity: None,
-            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1866, 2426),
+            span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1908, 2557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(950),
+            id: DeclarationId(957),
             name: Some("go_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25584,7 +25806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({left}, {right}...)".to_string(),
                             ))],
@@ -25597,7 +25819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -25608,15 +25830,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(951),
+            id: DeclarationId(958),
             name: Some("go_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25635,7 +25857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "int64(len({recv}))".to_string(),
                             ))],
@@ -25648,7 +25870,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -25659,15 +25881,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(952),
+            id: DeclarationId(959),
             name: Some("go_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25686,7 +25908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv}) == 0".to_string(),
                             ))],
@@ -25699,7 +25921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -25710,15 +25932,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(953),
+            id: DeclarationId(960),
             name: Some("go_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25739,7 +25961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* fold({recv}, {init}, {body}) */".to_string(),
                             ))],
@@ -25752,7 +25974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -25763,15 +25985,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(954),
+            id: DeclarationId(961),
             name: Some("go_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25792,7 +26014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "/* map({recv}, {body}) */".to_string(),
                             ))],
@@ -25805,7 +26027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -25816,15 +26038,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(955),
+            id: DeclarationId(962),
             name: Some("go_filter_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25845,7 +26067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Filter({recv}, {arg})".to_string(),
                             ))],
@@ -25858,7 +26080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -25869,15 +26091,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(956),
+            id: DeclarationId(963),
             name: Some("go_any_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25898,7 +26120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.Any({recv}, {arg})".to_string(),
                             ))],
@@ -25911,7 +26133,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -25922,15 +26144,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(957),
+            id: DeclarationId(964),
             name: Some("go_all_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -25951,7 +26173,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.All({recv}, {arg})".to_string(),
                             ))],
@@ -25964,7 +26186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -25975,15 +26197,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(958),
+            id: DeclarationId(965),
             name: Some("go_flat_map_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -26004,7 +26226,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.FlatMap({recv}, {arg})".to_string(),
                             ))],
@@ -26017,7 +26239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -26028,18 +26250,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(959),
+            id: DeclarationId(966),
             name: Some("go_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(946),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2026)),
+            meta_tag: Some(DeclarationId(2049)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -26058,7 +26280,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -26071,7 +26293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -26093,7 +26315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Join({recv}, {arg})".to_string(),
                             ))],
@@ -26106,7 +26328,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -26128,7 +26350,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Split({recv}, {arg})".to_string(),
                             ))],
@@ -26141,15 +26363,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
                 ]),
-                FieldValue::Reference(DeclarationId(955)),
-                FieldValue::Reference(DeclarationId(956)),
-                FieldValue::Reference(DeclarationId(957)),
-                FieldValue::Reference(DeclarationId(958)),
+                FieldValue::Reference(DeclarationId(962)),
+                FieldValue::Reference(DeclarationId(963)),
+                FieldValue::Reference(DeclarationId(964)),
+                FieldValue::Reference(DeclarationId(965)),
                 FieldValue::Record(vec![
                     (
                         "dag_method".to_string(),
@@ -26165,7 +26387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -26178,7 +26400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -26198,7 +26420,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -26211,7 +26433,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -26233,7 +26455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "v2rt.SortBy({recv}, {arg})".to_string(),
                             ))],
@@ -26246,7 +26468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -26268,7 +26490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "append({recv}, {arg})".to_string(),
                             ))],
@@ -26281,7 +26503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -26303,7 +26525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "strings.Contains({recv}, {arg})".to_string(),
                             ))],
@@ -26316,7 +26538,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -26327,29 +26549,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(960),
+            id: DeclarationId(967),
             name: Some("RecursionShape".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DirectRecursion".to_string(),
-                        ty: DeclarationId(2036),
+                        ty: DeclarationId(2059),
                     },
                     Field {
                         label: "ListRecursion".to_string(),
-                        ty: DeclarationId(2037),
+                        ty: DeclarationId(2060),
                     },
                     Field {
                         label: "OptionalRecursion".to_string(),
-                        ty: DeclarationId(2038),
+                        ty: DeclarationId(2061),
                     },
                     Field {
                         label: "SetRecursion".to_string(),
-                        ty: DeclarationId(2039),
+                        ty: DeclarationId(2062),
                     },
                     Field {
                         label: "MapValueRecursion".to_string(),
-                        ty: DeclarationId(2040),
+                        ty: DeclarationId(2063),
                     },
                 ],
             },
@@ -26364,7 +26586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5538, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(961),
+            id: DeclarationId(968),
             name: Some("InductiveField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -26382,7 +26604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "shape".to_string(),
-                        ty: DeclarationId(960),
+                        ty: DeclarationId(967),
                     },
                     Field {
                         label: "element_type".to_string(),
@@ -26401,10 +26623,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 7103, 7525),
         });
         declarations.push(Declaration {
-            id: DeclarationId(962),
+            id: DeclarationId(969),
             name: Some("recursion_shape_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(960), DeclarationId(960)],
+                inputs: vec![DeclarationId(967), DeclarationId(967)],
                 output: DeclarationId(100),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7595, 7967)),
             },
@@ -26419,10 +26641,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 7527, 7967),
         });
         declarations.push(Declaration {
-            id: DeclarationId(963),
+            id: DeclarationId(970),
             name: Some("inductive_field_eq".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(961), DeclarationId(961)],
+                inputs: vec![DeclarationId(968), DeclarationId(968)],
                 output: DeclarationId(100),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8037, 8235)),
             },
@@ -26437,11 +26659,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 7969, 8235),
         });
         declarations.push(Declaration {
-            id: DeclarationId(964),
+            id: DeclarationId(971),
             name: Some("inductive_field_to_dimension".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(961), DeclarationId(197)],
-                output: DeclarationId(1059),
+                inputs: vec![DeclarationId(968), DeclarationId(197)],
+                output: DeclarationId(1066),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8701, 8732)),
             },
             type_params: vec![],
@@ -26455,29 +26677,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 8611, 8732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(965),
+            id: DeclarationId(972),
             name: Some("SubValueRelation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "StrictSubValue".to_string(),
-                        ty: DeclarationId(2041),
+                        ty: DeclarationId(2064),
                     },
                     Field {
                         label: "IteratedSubValue".to_string(),
-                        ty: DeclarationId(2042),
+                        ty: DeclarationId(2065),
                     },
                     Field {
                         label: "ArithmeticDescent".to_string(),
-                        ty: DeclarationId(2043),
+                        ty: DeclarationId(2066),
                     },
                     Field {
                         label: "PreservedValue".to_string(),
-                        ty: DeclarationId(2044),
+                        ty: DeclarationId(2067),
                     },
                     Field {
                         label: "SubValueUnknown".to_string(),
-                        ty: DeclarationId(2045),
+                        ty: DeclarationId(2068),
                     },
                 ],
             },
@@ -26492,11 +26714,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9878, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(966),
+            id: DeclarationId(973),
             name: Some("sub_value_to_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965)],
-                output: DeclarationId(1052),
+                inputs: vec![DeclarationId(972)],
+                output: DeclarationId(1059),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     11067,
@@ -26514,7 +26736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10995, 11670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(967),
+            id: DeclarationId(974),
             name: Some("shrink_factor_eq".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(848), DeclarationId(848)],
@@ -26536,11 +26758,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 12076, 12638),
         });
         declarations.push(Declaration {
-            id: DeclarationId(968),
+            id: DeclarationId(975),
             name: Some("meet_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965), DeclarationId(965)],
-                output: DeclarationId(965),
+                inputs: vec![DeclarationId(972), DeclarationId(972)],
+                output: DeclarationId(972),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     13229,
@@ -26558,11 +26780,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 13149, 14641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(969),
+            id: DeclarationId(976),
             name: Some("join_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965), DeclarationId(965)],
-                output: DeclarationId(965),
+                inputs: vec![DeclarationId(972), DeclarationId(972)],
+                output: DeclarationId(972),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     14973,
@@ -26580,11 +26802,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 14893, 16276),
         });
         declarations.push(Declaration {
-            id: DeclarationId(970),
+            id: DeclarationId(977),
             name: Some("compose_sub_value".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965), DeclarationId(961)],
-                output: DeclarationId(965),
+                inputs: vec![DeclarationId(972), DeclarationId(968)],
+                output: DeclarationId(972),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     17419,
@@ -26602,11 +26824,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 17331, 17541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(971),
+            id: DeclarationId(978),
             name: Some("compose_sub_value_relations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965), DeclarationId(965)],
-                output: DeclarationId(965),
+                inputs: vec![DeclarationId(972), DeclarationId(972)],
+                output: DeclarationId(972),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     18397,
@@ -26624,11 +26846,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 18289, 19743),
         });
         declarations.push(Declaration {
-            id: DeclarationId(972),
+            id: DeclarationId(979),
             name: Some("sub_value_to_call_pattern".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965)],
-                output: DeclarationId(2027),
+                inputs: vec![DeclarationId(972)],
+                output: DeclarationId(2050),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     20518,
@@ -26646,11 +26868,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20445, 21314),
         });
         declarations.push(Declaration {
-            id: DeclarationId(973),
+            id: DeclarationId(980),
             name: Some("sub_value_to_lowering_target".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(965)],
-                output: DeclarationId(2028),
+                inputs: vec![DeclarationId(972)],
+                output: DeclarationId(2051),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     21906,
@@ -26668,25 +26890,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21827, 22811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(974),
+            id: DeclarationId(981),
             name: Some("PolynomialExponent".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerExpZero".to_string(),
-                        ty: DeclarationId(2046),
+                        ty: DeclarationId(2069),
                     },
                     Field {
                         label: "IntegerExpPos".to_string(),
-                        ty: DeclarationId(2047),
+                        ty: DeclarationId(2070),
                     },
                     Field {
                         label: "FractionExp".to_string(),
-                        ty: DeclarationId(2048),
+                        ty: DeclarationId(2071),
                     },
                     Field {
                         label: "LogBasedExp".to_string(),
-                        ty: DeclarationId(2049),
+                        ty: DeclarationId(2072),
                     },
                 ],
             },
@@ -26701,11 +26923,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24054, 24309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(975),
+            id: DeclarationId(982),
             name: Some("poly_exp_degree_one".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(974),
+                output: DeclarationId(981),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     24358,
@@ -26723,17 +26945,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24311, 24397),
         });
         declarations.push(Declaration {
-            id: DeclarationId(976),
+            id: DeclarationId(983),
             name: Some("AtomicCost".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "PolyCost".to_string(),
-                        ty: DeclarationId(2050),
+                        ty: DeclarationId(2073),
                     },
                     Field {
                         label: "LogCost".to_string(),
-                        ty: DeclarationId(2051),
+                        ty: DeclarationId(2074),
                     },
                 ],
             },
@@ -26748,37 +26970,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24909, 25026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(977),
+            id: DeclarationId(984),
             name: Some("CostBound".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ConstantBound".to_string(),
-                        ty: DeclarationId(2052),
+                        ty: DeclarationId(2075),
                     },
                     Field {
                         label: "AtomicBound".to_string(),
-                        ty: DeclarationId(2053),
+                        ty: DeclarationId(2076),
                     },
                     Field {
                         label: "ProductBound".to_string(),
-                        ty: DeclarationId(2055),
+                        ty: DeclarationId(2078),
                     },
                     Field {
                         label: "SumOfProductsBound".to_string(),
-                        ty: DeclarationId(2058),
+                        ty: DeclarationId(2081),
                     },
                     Field {
                         label: "SumBound".to_string(),
-                        ty: DeclarationId(2060),
+                        ty: DeclarationId(2083),
                     },
                     Field {
                         label: "ForeverBound".to_string(),
-                        ty: DeclarationId(2061),
+                        ty: DeclarationId(2084),
                     },
                     Field {
                         label: "ErrorBound".to_string(),
-                        ty: DeclarationId(2062),
+                        ty: DeclarationId(2085),
                     },
                 ],
             },
@@ -26793,11 +27015,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26656, 27416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(978),
+            id: DeclarationId(985),
             name: Some("sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2029)],
-                output: DeclarationId(977),
+                inputs: vec![DeclarationId(2052)],
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     27827,
@@ -26815,10 +27037,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27777, 27933),
         });
         declarations.push(Declaration {
-            id: DeclarationId(979),
+            id: DeclarationId(986),
             name: Some("cost_bound_is_sum_bound".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(977)],
+                inputs: vec![DeclarationId(984)],
                 output: DeclarationId(100),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
@@ -26837,11 +27059,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 28208, 28510),
         });
         declarations.push(Declaration {
-            id: DeclarationId(980),
+            id: DeclarationId(987),
             name: Some("cost_constant".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28544,
@@ -26859,11 +27081,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 28512, 28561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(981),
+            id: DeclarationId(988),
             name: Some("cost_linear".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28605,
@@ -26881,11 +27103,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 28562, 28689),
         });
         declarations.push(Declaration {
-            id: DeclarationId(982),
+            id: DeclarationId(989),
             name: Some("cost_poly".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     28744,
@@ -26903,11 +27125,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 28690, 29143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(983),
+            id: DeclarationId(990),
             name: Some("cost_root".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29193,
@@ -26925,11 +27147,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29144, 29467),
         });
         declarations.push(Declaration {
-            id: DeclarationId(984),
+            id: DeclarationId(991),
             name: Some("cost_sqrt".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29509,
@@ -26947,11 +27169,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29468, 29542),
         });
         declarations.push(Declaration {
-            id: DeclarationId(985),
+            id: DeclarationId(992),
             name: Some("cost_cbrt".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29584,
@@ -26969,11 +27191,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29543, 29617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(986),
+            id: DeclarationId(993),
             name: Some("cost_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29658,
@@ -26991,11 +27213,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29618, 29708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(987),
+            id: DeclarationId(994),
             name: Some("cost_nlogn".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29752,
@@ -27013,11 +27235,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29710, 29870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(988),
+            id: DeclarationId(995),
             name: Some("cost_graph_linear".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(197)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     29940,
@@ -27035,7 +27257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 29872, 30116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(989),
+            id: DeclarationId(996),
             name: Some("RecurrenceForm".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27068,11 +27290,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31273, 31364),
         });
         declarations.push(Declaration {
-            id: DeclarationId(990),
+            id: DeclarationId(997),
             name: Some("int_add_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2030),
+                output: DeclarationId(2053),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     31955,
@@ -27090,11 +27312,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31912, 32206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(991),
+            id: DeclarationId(998),
             name: Some("int_mul_checked".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2031),
+                output: DeclarationId(2054),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     32251,
@@ -27112,11 +27334,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 32208, 33040),
         });
         declarations.push(Declaration {
-            id: DeclarationId(992),
+            id: DeclarationId(999),
             name: Some("bounded_int_pow_exponent".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2032),
+                output: DeclarationId(2055),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33500,
@@ -27134,11 +27356,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33456, 33623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(993),
+            id: DeclarationId(1000),
             name: Some("int_pow_bounded".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2033),
+                output: DeclarationId(2056),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     33975,
@@ -27156,11 +27378,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33927, 35020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(994),
+            id: DeclarationId(1001),
             name: Some("ceil_log".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81), DeclarationId(81)],
-                output: DeclarationId(2034),
+                output: DeclarationId(2057),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35238,
@@ -27178,7 +27400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35192, 35353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(995),
+            id: DeclarationId(1002),
             name: Some("ceil_log_iter".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -27187,7 +27409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(81),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(2035),
+                output: DeclarationId(2058),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35510,
@@ -27205,11 +27427,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35439, 35872),
         });
         declarations.push(Declaration {
-            id: DeclarationId(996),
+            id: DeclarationId(1003),
             name: Some("master_theorem".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(989)],
-                output: DeclarationId(977),
+                inputs: vec![DeclarationId(996)],
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     35927,
@@ -27227,11 +27449,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35874, 37964),
         });
         declarations.push(Declaration {
-            id: DeclarationId(997),
+            id: DeclarationId(1004),
             name: Some("catamorphism_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(81)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     38317,
@@ -27249,7 +27471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 38247, 38475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(998),
+            id: DeclarationId(1005),
             name: Some("derive_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
@@ -27258,7 +27480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     DeclarationId(848),
                     DeclarationId(81),
                 ],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     38974,
@@ -27276,11 +27498,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 38873, 39998),
         });
         declarations.push(Declaration {
-            id: DeclarationId(999),
+            id: DeclarationId(1006),
             name: Some("tree_traversal_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40331,
@@ -27298,11 +27520,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 40292, 40388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1000),
+            id: DeclarationId(1007),
             name: Some("nested_iteration_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40431,
@@ -27320,11 +27542,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 40390, 40489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1001),
+            id: DeclarationId(1008),
             name: Some("linear_scan_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40589,
@@ -27342,11 +27564,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 40553, 40644),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1002),
+            id: DeclarationId(1009),
             name: Some("binary_search_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     40841,
@@ -27364,11 +27586,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 40803, 40956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1003),
+            id: DeclarationId(1010),
             name: Some("mergesort_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41036,
@@ -27386,11 +27608,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41002, 41151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1004),
+            id: DeclarationId(1011),
             name: Some("karatsuba_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41318,
@@ -27408,11 +27630,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41284, 41437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1005),
+            id: DeclarationId(1012),
             name: Some("strassen_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41602,
@@ -27430,11 +27652,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41569, 41716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1006),
+            id: DeclarationId(1013),
             name: Some("trial_division_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41833,
@@ -27452,11 +27674,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41794, 41858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1007),
+            id: DeclarationId(1014),
             name: Some("cube_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     41893,
@@ -27474,11 +27696,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41859, 41918),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1008),
+            id: DeclarationId(1015),
             name: Some("kth_root_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42000,
@@ -27496,11 +27718,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 41961, 42031),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1009),
+            id: DeclarationId(1016),
             name: Some("bfs_dfs_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42267,
@@ -27518,11 +27740,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42235, 42318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1010),
+            id: DeclarationId(1017),
             name: Some("dijkstra_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42409,
@@ -27540,11 +27762,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42376, 42691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1011),
+            id: DeclarationId(1018),
             name: Some("bellman_ford_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     42794,
@@ -27562,11 +27784,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 42757, 42954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1012),
+            id: DeclarationId(1019),
             name: Some("floyd_warshall_bound".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(977),
+                output: DeclarationId(984),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/induction.dag",
                     43061,
@@ -27584,18 +27806,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 43022, 43099),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1013),
+            id: DeclarationId(1020),
             name: Some("signed_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1105),
+                    value: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2063)),
+            meta_tag: Some(DeclarationId(2086)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27610,18 +27832,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(1014),
+            id: DeclarationId(1021),
             name: Some("unsigned_int_diagnostic_order".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1105),
+                    value: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2064)),
+            meta_tag: Some(DeclarationId(2087)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -27636,7 +27858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1015),
+            id: DeclarationId(1022),
             name: Some("Lens".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -27646,27 +27868,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "read".to_string(),
-                        ty: DeclarationId(2066),
+                        ty: DeclarationId(2089),
                     },
                     Field {
                         label: "sequential".to_string(),
-                        ty: DeclarationId(2067),
+                        ty: DeclarationId(2090),
                     },
                     Field {
                         label: "branch".to_string(),
-                        ty: DeclarationId(2068),
+                        ty: DeclarationId(2091),
                     },
                     Field {
                         label: "iterate".to_string(),
-                        ty: DeclarationId(2069),
+                        ty: DeclarationId(2092),
                     },
                     Field {
                         label: "validate".to_string(),
-                        ty: DeclarationId(2070),
+                        ty: DeclarationId(2093),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1016)],
+            type_params: vec![DeclarationId(1023)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -27677,7 +27899,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(1016),
+            id: DeclarationId(1023),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())),
             type_params: vec![],
@@ -27691,21 +27913,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1017),
+            id: DeclarationId(1024),
             name: Some("Lookup".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Miss".to_string(),
-                        ty: DeclarationId(2073),
+                        ty: DeclarationId(2096),
                     },
                     Field {
                         label: "Hit".to_string(),
-                        ty: DeclarationId(2074),
+                        ty: DeclarationId(2097),
                     },
                 ],
             },
-            type_params: vec![DeclarationId(1018)],
+            type_params: vec![DeclarationId(1025)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -27716,7 +27938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4509, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1018),
+            id: DeclarationId(1025),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())),
             type_params: vec![],
@@ -27730,11 +27952,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4509, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1019),
+            id: DeclarationId(1026),
             name: Some("miss_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
-                output: DeclarationId(2071),
+                output: DeclarationId(2094),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)),
             },
             type_params: vec![],
@@ -27748,11 +27970,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1020),
+            id: DeclarationId(1027),
             name: Some("hit_int_lookup".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2072),
+                output: DeclarationId(2095),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)),
             },
             type_params: vec![],
@@ -27766,15 +27988,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4601, 4654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1021),
+            id: DeclarationId(1028),
             name: Some("python_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -27793,7 +28015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[*{left}, *{right}]".to_string(),
                             ))],
@@ -27806,7 +28028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -27821,15 +28043,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1022),
+            id: DeclarationId(1029),
             name: Some("python_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -27848,7 +28070,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -27861,7 +28083,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -27876,15 +28098,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1023),
+            id: DeclarationId(1030),
             name: Some("python_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -27903,7 +28125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "(len({recv}) == 0)".to_string(),
                             ))],
@@ -27916,7 +28138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -27931,15 +28153,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1024),
+            id: DeclarationId(1031),
             name: Some("python_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -27960,7 +28182,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "__v3_fold({recv}, {init}, {body})".to_string(),
                             ))],
@@ -27973,7 +28195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -27988,15 +28210,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1025),
+            id: DeclarationId(1032),
             name: Some("python_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28017,7 +28239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[{body} for {item} in {recv}]".to_string(),
                             ))],
@@ -28030,7 +28252,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28045,15 +28267,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1026),
+            id: DeclarationId(1033),
             name: Some("python_filter_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28074,7 +28296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[x for x in {recv} if {arg}(x)]".to_string(),
                             ))],
@@ -28087,7 +28309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28102,15 +28324,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1027),
+            id: DeclarationId(1034),
             name: Some("python_any_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28131,7 +28353,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "any({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28144,7 +28366,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28159,15 +28381,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1028),
+            id: DeclarationId(1035),
             name: Some("python_all_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28188,7 +28410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "all({arg}(x) for x in {recv})".to_string(),
                             ))],
@@ -28201,7 +28423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28216,15 +28438,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1029),
+            id: DeclarationId(1036),
             name: Some("python_flat_map_method_template_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -28245,7 +28467,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[y for x in {recv} for y in {arg}(x)]".to_string(),
                             ))],
@@ -28258,7 +28480,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28273,18 +28495,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1030),
+            id: DeclarationId(1037),
             name: Some("python_method_template_contracts".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(946),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2075)),
+            meta_tag: Some(DeclarationId(2098)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
@@ -28303,7 +28525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "len({recv})".to_string(),
                             ))],
@@ -28316,7 +28538,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28336,7 +28558,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg}.join({recv})".to_string(),
                             ))],
@@ -28349,7 +28571,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28369,7 +28591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}.split({arg})".to_string(),
                             ))],
@@ -28382,7 +28604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28404,7 +28626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[-1] if {recv} else None".to_string(),
                             ))],
@@ -28417,7 +28639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28439,7 +28661,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[0] if {recv} else None".to_string(),
                             ))],
@@ -28452,7 +28674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28474,7 +28696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "list(enumerate({recv}))".to_string(),
                             ))],
@@ -28487,7 +28709,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28509,7 +28731,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "[ord(c) for c in {recv}]".to_string(),
                             ))],
@@ -28522,15 +28744,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
                 ]),
-                FieldValue::Reference(DeclarationId(1026)),
-                FieldValue::Reference(DeclarationId(1027)),
-                FieldValue::Reference(DeclarationId(1028)),
-                FieldValue::Reference(DeclarationId(1029)),
+                FieldValue::Reference(DeclarationId(1033)),
+                FieldValue::Reference(DeclarationId(1034)),
+                FieldValue::Reference(DeclarationId(1035)),
+                FieldValue::Reference(DeclarationId(1036)),
                 FieldValue::Record(vec![
                     (
                         "dag_method".to_string(),
@@ -28546,7 +28768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[{arg}:]".to_string(),
                             ))],
@@ -28559,7 +28781,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28579,7 +28801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv}[:{arg}]".to_string(),
                             ))],
@@ -28592,7 +28814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28614,7 +28836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "sorted({recv}, key={arg})".to_string(),
                             ))],
@@ -28627,7 +28849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28647,7 +28869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{recv} + [{arg}]".to_string(),
                             ))],
@@ -28660,7 +28882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28680,7 +28902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{arg} in {recv}".to_string(),
                             ))],
@@ -28693,7 +28915,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -28708,7 +28930,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1031),
+            id: DeclarationId(1038),
             name: Some("ResourceHandle".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28741,12 +28963,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(1032),
+            id: DeclarationId(1039),
             name: Some("ResourceReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "target".to_string(),
-                    ty: DeclarationId(1105),
+                    ty: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -28760,7 +28982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/resources.dag", 829, 880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1033),
+            id: DeclarationId(1040),
             name: Some("NamedField".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28770,7 +28992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "value".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                 ],
             },
@@ -28785,29 +29007,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 755, 805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1034),
+            id: DeclarationId(1041),
             name: Some("Value".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "LiteralValue".to_string(),
-                        ty: DeclarationId(2076),
+                        ty: DeclarationId(2099),
                     },
                     Field {
                         label: "RecordValue".to_string(),
-                        ty: DeclarationId(2078),
+                        ty: DeclarationId(2101),
                     },
                     Field {
                         label: "VariantValue".to_string(),
-                        ty: DeclarationId(2079),
+                        ty: DeclarationId(2102),
                     },
                     Field {
                         label: "NodeRef".to_string(),
-                        ty: DeclarationId(2080),
+                        ty: DeclarationId(2103),
                     },
                     Field {
                         label: "CardinalityValue".to_string(),
-                        ty: DeclarationId(2081),
+                        ty: DeclarationId(2104),
                     },
                 ],
             },
@@ -28822,15 +29044,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2117, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1035),
+            id: DeclarationId(1042),
             name: Some("ProgramObservation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "observed".to_string(),
-                    ty: DeclarationId(1036),
+                    ty: DeclarationId(1043),
                 }],
             },
-            type_params: vec![DeclarationId(1036)],
+            type_params: vec![DeclarationId(1043)],
             phantom_params: Vec::new(),
             meta_tag: None,
             specialization_parent: None,
@@ -28841,7 +29063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3203, 3259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1036),
+            id: DeclarationId(1043),
             name: None,
             connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())),
             type_params: vec![],
@@ -28855,12 +29077,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3203, 3259),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1037),
+            id: DeclarationId(1044),
             name: Some("EvalFrame".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "bindings".to_string(),
-                    ty: DeclarationId(2082),
+                    ty: DeclarationId(2105),
                 }],
             },
             type_params: vec![],
@@ -28874,12 +29096,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3902, 3951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1038),
+            id: DeclarationId(1045),
             name: Some("EvalStateStack".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "frames".to_string(),
-                    ty: DeclarationId(2083),
+                    ty: DeclarationId(2106),
                 }],
             },
             type_params: vec![],
@@ -28893,12 +29115,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4505, 4554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1039),
+            id: DeclarationId(1046),
             name: Some("EvalStateKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "state".to_string(),
-                    ty: DeclarationId(1038),
+                    ty: DeclarationId(1045),
                 }],
             },
             type_params: vec![],
@@ -28912,12 +29134,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4935, 4980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1040),
+            id: DeclarationId(1047),
             name: Some("EvalStrategy".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "ApplicativeOrder".to_string(),
-                    ty: DeclarationId(2084),
+                    ty: DeclarationId(2107),
                 }],
             },
             type_params: vec![],
@@ -28931,12 +29153,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5385, 5459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1041),
+            id: DeclarationId(1048),
             name: Some("InputEvaluationOrder".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![Field {
                     label: "LeftFirst".to_string(),
-                    ty: DeclarationId(2085),
+                    ty: DeclarationId(2108),
                 }],
             },
             type_params: vec![],
@@ -28950,7 +29172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5696, 5733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1042),
+            id: DeclarationId(1049),
             name: Some("EvalMemoKey".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -28964,11 +29186,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "state_key".to_string(),
-                        ty: DeclarationId(1039),
+                        ty: DeclarationId(1046),
                     },
                     Field {
                         label: "strategy".to_string(),
-                        ty: DeclarationId(1040),
+                        ty: DeclarationId(1047),
                     },
                 ],
             },
@@ -28982,13 +29204,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153),
         });
-        declarations.push(Declaration { id: DeclarationId(1043), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(946), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(946)), 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(230)))])), ("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(2025), 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(2023), 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(1044), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(946), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(946)), 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(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), 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(2023), 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(1045), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(946), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(946)), 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(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), 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(2023), 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(1046), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(946), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(946)), 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(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2025), 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(2023), 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(1047), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(606), arguments: vec![TemplateArgument { parameter: DeclarationId(607), value: DeclarationId(946) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2086)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), 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(2023), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), 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(2023), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), 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(2023), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), 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(2023), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), 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(2023), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), 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(2023), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), 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(2023), payload: vec![] })]), FieldValue::Reference(DeclarationId(1043)), FieldValue::Reference(DeclarationId(1044)), FieldValue::Reference(DeclarationId(1045)), FieldValue::Reference(DeclarationId(1046)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), 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(2023), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2024), 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(2023), 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(1050), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(953), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(953)), 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(230)))])), ("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(2048), 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(2046), 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(1051), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(953), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(953)), 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(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2048), 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(2046), 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(1052), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(953), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(953)), 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(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2048), 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(2046), 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(1053), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(953), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(953)), 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(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2048), 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(2046), 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(1054), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(606), arguments: vec![TemplateArgument { parameter: DeclarationId(607), value: DeclarationId(953) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2109)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2047), 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(2046), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(238)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2047), 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(2046), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2047), 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(2046), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(240)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2047), 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(2046), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2047), 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(2046), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2047), 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(2046), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2047), 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(2046), payload: vec![] })]), FieldValue::Reference(DeclarationId(1050)), FieldValue::Reference(DeclarationId(1051)), FieldValue::Reference(DeclarationId(1052)), FieldValue::Reference(DeclarationId(1053)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(260)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2047), 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(2046), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(266)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::<Vec<_>>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2047), 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(2046), 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(1048),
+            id: DeclarationId(1055),
             name: Some("InputField".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -29002,7 +29224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1049),
+            id: DeclarationId(1056),
             name: Some("RestEndpointBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -29027,12 +29249,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 4653, 4725),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1050),
+            id: DeclarationId(1057),
             name: Some("CallableRef".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "decl".to_string(),
-                    ty: DeclarationId(1105),
+                    ty: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -29046,21 +29268,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 5533, 5576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1051),
+            id: DeclarationId(1058),
             name: Some("Operation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "callable".to_string(),
-                        ty: DeclarationId(1050),
+                        ty: DeclarationId(1057),
                     },
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(2087),
+                        ty: DeclarationId(2110),
                     },
                     Field {
                         label: "endpoint".to_string(),
-                        ty: DeclarationId(1049),
+                        ty: DeclarationId(1056),
                     },
                 ],
             },
@@ -29075,21 +29297,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 6785, 6895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1052),
+            id: DeclarationId(1059),
             name: Some("DescentEvidence".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Strict".to_string(),
-                        ty: DeclarationId(2095),
+                        ty: DeclarationId(2118),
                     },
                     Field {
                         label: "NonIncreasing".to_string(),
-                        ty: DeclarationId(2096),
+                        ty: DeclarationId(2119),
                     },
                     Field {
                         label: "DescentUnknown".to_string(),
-                        ty: DeclarationId(2097),
+                        ty: DeclarationId(2120),
                     },
                 ],
             },
@@ -29104,10 +29326,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 642, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1053),
+            id: DeclarationId(1060),
             name: Some("evidence_rank".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1052)],
+                inputs: vec![DeclarationId(1059)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 756, 838)),
             },
@@ -29122,11 +29344,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 712, 838),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1054),
+            id: DeclarationId(1061),
             name: Some("merge_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1052), DeclarationId(1052)],
-                output: DeclarationId(1052),
+                inputs: vec![DeclarationId(1059), DeclarationId(1059)],
+                output: DeclarationId(1059),
                 body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 982, 1310)),
             },
             type_params: vec![],
@@ -29140,11 +29362,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 905, 1310),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1055),
+            id: DeclarationId(1062),
             name: Some("join_evidence".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1052), DeclarationId(1052)],
-                output: DeclarationId(1052),
+                inputs: vec![DeclarationId(1059), DeclarationId(1059)],
+                output: DeclarationId(1059),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     1456,
@@ -29162,11 +29384,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 1380, 1655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1056),
+            id: DeclarationId(1063),
             name: Some("promote_to_strict".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1052)],
-                output: DeclarationId(1052),
+                inputs: vec![DeclarationId(1059)],
+                output: DeclarationId(1059),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2117,
@@ -29184,11 +29406,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2050, 2236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1057),
+            id: DeclarationId(1064),
             name: Some("optional_evidence_meet".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2088), DeclarationId(2089)],
-                output: DeclarationId(2090),
+                inputs: vec![DeclarationId(2111), DeclarationId(2112)],
+                output: DeclarationId(2113),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2388,
@@ -29206,11 +29428,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2300, 2564),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1058),
+            id: DeclarationId(1065),
             name: Some("map_evidence_merge_at".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2091), DeclarationId(197), DeclarationId(1052)],
-                output: DeclarationId(2092),
+                inputs: vec![DeclarationId(2114), DeclarationId(197), DeclarationId(1059)],
+                output: DeclarationId(2115),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     2733,
@@ -29228,29 +29450,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2601, 2907),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1059),
+            id: DeclarationId(1066),
             name: Some("RankingDimension".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TreeSize".to_string(),
-                        ty: DeclarationId(2098),
+                        ty: DeclarationId(2121),
                     },
                     Field {
                         label: "ListLength".to_string(),
-                        ty: DeclarationId(2099),
+                        ty: DeclarationId(2122),
                     },
                     Field {
                         label: "ArithmeticValue".to_string(),
-                        ty: DeclarationId(2100),
+                        ty: DeclarationId(2123),
                     },
                     Field {
                         label: "TokenPosition".to_string(),
-                        ty: DeclarationId(2101),
+                        ty: DeclarationId(2124),
                     },
                     Field {
                         label: "SetCardinality".to_string(),
-                        ty: DeclarationId(2102),
+                        ty: DeclarationId(2125),
                     },
                 ],
             },
@@ -29265,17 +29487,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3206, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1060),
+            id: DeclarationId(1067),
             name: Some("PositiveDescentAmount".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OneStep".to_string(),
-                        ty: DeclarationId(2103),
+                        ty: DeclarationId(2126),
                     },
                     Field {
                         label: "AdditionalStep".to_string(),
-                        ty: DeclarationId(2104),
+                        ty: DeclarationId(2127),
                     },
                 ],
             },
@@ -29290,17 +29512,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4378, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1061),
+            id: DeclarationId(1068),
             name: Some("ProportionalDivisor".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "DivideByTwo".to_string(),
-                        ty: DeclarationId(2105),
+                        ty: DeclarationId(2128),
                     },
                     Field {
                         label: "StrictlyLarger".to_string(),
-                        ty: DeclarationId(2106),
+                        ty: DeclarationId(2129),
                     },
                 ],
             },
@@ -29315,10 +29537,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4937, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1062),
+            id: DeclarationId(1069),
             name: Some("proportional_divisor_to_int".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1061)],
+                inputs: vec![DeclarationId(1068)],
                 output: DeclarationId(81),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
@@ -29337,7 +29559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5029, 5204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1063),
+            id: DeclarationId(1070),
             name: Some("peano_literal_materialization_cap".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![],
@@ -29359,11 +29581,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5388, 5441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1064),
+            id: DeclarationId(1071),
             name: Some("positive_descent_amount_from_positive_int".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2093),
+                output: DeclarationId(2116),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     5902,
@@ -29381,11 +29603,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5823, 6262),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1065),
+            id: DeclarationId(1072),
             name: Some("proportional_divisor_from_int_at_least_two".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(81)],
-                output: DeclarationId(2094),
+                output: DeclarationId(2117),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/termination.dag",
                     6342,
@@ -29403,37 +29625,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6264, 6703),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1066),
+            id: DeclarationId(1073),
             name: Some("DescentSource".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "ChildAccessor".to_string(),
-                        ty: DeclarationId(2107),
+                        ty: DeclarationId(2130),
                     },
                     Field {
                         label: "ListShrink".to_string(),
-                        ty: DeclarationId(2108),
+                        ty: DeclarationId(2131),
                     },
                     Field {
                         label: "ArithmeticSubtractDescent".to_string(),
-                        ty: DeclarationId(2109),
+                        ty: DeclarationId(2132),
                     },
                     Field {
                         label: "ArithmeticDivideDescent".to_string(),
-                        ty: DeclarationId(2110),
+                        ty: DeclarationId(2133),
                     },
                     Field {
                         label: "ParserAdvance".to_string(),
-                        ty: DeclarationId(2111),
+                        ty: DeclarationId(2134),
                     },
                     Field {
                         label: "SetRemoval".to_string(),
-                        ty: DeclarationId(2112),
+                        ty: DeclarationId(2135),
                     },
                     Field {
                         label: "FoldIteration".to_string(),
-                        ty: DeclarationId(2113),
+                        ty: DeclarationId(2136),
                     },
                 ],
             },
@@ -29448,12 +29670,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7108, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1067),
+            id: DeclarationId(1074),
             name: Some("TerminationProof".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "dimensions".to_string(),
-                    ty: DeclarationId(2114),
+                    ty: DeclarationId(2137),
                 }],
             },
             type_params: vec![],
@@ -29467,7 +29689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7431, 7493),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1068),
+            id: DeclarationId(1075),
             name: Some("ProofEdge".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -29481,7 +29703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "evidence".to_string(),
-                        ty: DeclarationId(2115),
+                        ty: DeclarationId(2138),
                     },
                 ],
             },
@@ -29496,189 +29718,189 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7638, 7724),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1069),
+            id: DeclarationId(1076),
             name: Some("TokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2116),
+                        ty: DeclarationId(2139),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2117),
+                        ty: DeclarationId(2140),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2118),
+                        ty: DeclarationId(2141),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2119),
+                        ty: DeclarationId(2142),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2120),
+                        ty: DeclarationId(2143),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2121),
+                        ty: DeclarationId(2144),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2122),
+                        ty: DeclarationId(2145),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2123),
+                        ty: DeclarationId(2146),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2124),
+                        ty: DeclarationId(2147),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2125),
+                        ty: DeclarationId(2148),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2126),
+                        ty: DeclarationId(2149),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2127),
+                        ty: DeclarationId(2150),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2128),
+                        ty: DeclarationId(2151),
                     },
                     Field {
                         label: "Ident".to_string(),
-                        ty: DeclarationId(2129),
+                        ty: DeclarationId(2152),
                     },
                     Field {
                         label: "IntLit".to_string(),
-                        ty: DeclarationId(2130),
+                        ty: DeclarationId(2153),
                     },
                     Field {
                         label: "StringLit".to_string(),
-                        ty: DeclarationId(2131),
+                        ty: DeclarationId(2154),
                     },
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2132),
+                        ty: DeclarationId(2155),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2133),
+                        ty: DeclarationId(2156),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2134),
+                        ty: DeclarationId(2157),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2135),
+                        ty: DeclarationId(2158),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2136),
+                        ty: DeclarationId(2159),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2137),
+                        ty: DeclarationId(2160),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2138),
+                        ty: DeclarationId(2161),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2139),
+                        ty: DeclarationId(2162),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2140),
+                        ty: DeclarationId(2163),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2141),
+                        ty: DeclarationId(2164),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2142),
+                        ty: DeclarationId(2165),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2143),
+                        ty: DeclarationId(2166),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2144),
+                        ty: DeclarationId(2167),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2145),
+                        ty: DeclarationId(2168),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2146),
+                        ty: DeclarationId(2169),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2147),
+                        ty: DeclarationId(2170),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2148),
+                        ty: DeclarationId(2171),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2149),
+                        ty: DeclarationId(2172),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2150),
+                        ty: DeclarationId(2173),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2151),
+                        ty: DeclarationId(2174),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2152),
+                        ty: DeclarationId(2175),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2153),
+                        ty: DeclarationId(2176),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2154),
+                        ty: DeclarationId(2177),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2155),
+                        ty: DeclarationId(2178),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2156),
+                        ty: DeclarationId(2179),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2157),
+                        ty: DeclarationId(2180),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2158),
+                        ty: DeclarationId(2181),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2159),
+                        ty: DeclarationId(2182),
                     },
                     Field {
                         label: "Eof".to_string(),
-                        ty: DeclarationId(2160),
+                        ty: DeclarationId(2183),
                     },
                 ],
             },
@@ -29693,13 +29915,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1070),
+            id: DeclarationId(1077),
             name: Some("Token".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1069),
+                        ty: DeclarationId(1076),
                     },
                     Field {
                         label: "span".to_string(),
@@ -29718,61 +29940,61 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1272, 1323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1071),
+            id: DeclarationId(1078),
             name: Some("KeywordTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "KwLet".to_string(),
-                        ty: DeclarationId(2161),
+                        ty: DeclarationId(2184),
                     },
                     Field {
                         label: "KwIf".to_string(),
-                        ty: DeclarationId(2162),
+                        ty: DeclarationId(2185),
                     },
                     Field {
                         label: "KwThen".to_string(),
-                        ty: DeclarationId(2163),
+                        ty: DeclarationId(2186),
                     },
                     Field {
                         label: "KwElse".to_string(),
-                        ty: DeclarationId(2164),
+                        ty: DeclarationId(2187),
                     },
                     Field {
                         label: "KwFn".to_string(),
-                        ty: DeclarationId(2165),
+                        ty: DeclarationId(2188),
                     },
                     Field {
                         label: "KwType".to_string(),
-                        ty: DeclarationId(2166),
+                        ty: DeclarationId(2189),
                     },
                     Field {
                         label: "KwModule".to_string(),
-                        ty: DeclarationId(2167),
+                        ty: DeclarationId(2190),
                     },
                     Field {
                         label: "KwImport".to_string(),
-                        ty: DeclarationId(2168),
+                        ty: DeclarationId(2191),
                     },
                     Field {
                         label: "KwMatch".to_string(),
-                        ty: DeclarationId(2169),
+                        ty: DeclarationId(2192),
                     },
                     Field {
                         label: "KwData".to_string(),
-                        ty: DeclarationId(2170),
+                        ty: DeclarationId(2193),
                     },
                     Field {
                         label: "KwWhere".to_string(),
-                        ty: DeclarationId(2171),
+                        ty: DeclarationId(2194),
                     },
                     Field {
                         label: "KwTrue".to_string(),
-                        ty: DeclarationId(2172),
+                        ty: DeclarationId(2195),
                     },
                     Field {
                         label: "KwFalse".to_string(),
-                        ty: DeclarationId(2173),
+                        ty: DeclarationId(2196),
                     },
                 ],
             },
@@ -29787,121 +30009,121 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1682, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1072),
+            id: DeclarationId(1079),
             name: Some("PunctTokenKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Eq".to_string(),
-                        ty: DeclarationId(2174),
+                        ty: DeclarationId(2197),
                     },
                     Field {
                         label: "EqEq".to_string(),
-                        ty: DeclarationId(2175),
+                        ty: DeclarationId(2198),
                     },
                     Field {
                         label: "NotEq".to_string(),
-                        ty: DeclarationId(2176),
+                        ty: DeclarationId(2199),
                     },
                     Field {
                         label: "Lt".to_string(),
-                        ty: DeclarationId(2177),
+                        ty: DeclarationId(2200),
                     },
                     Field {
                         label: "Le".to_string(),
-                        ty: DeclarationId(2178),
+                        ty: DeclarationId(2201),
                     },
                     Field {
                         label: "Gt".to_string(),
-                        ty: DeclarationId(2179),
+                        ty: DeclarationId(2202),
                     },
                     Field {
                         label: "Ge".to_string(),
-                        ty: DeclarationId(2180),
+                        ty: DeclarationId(2203),
                     },
                     Field {
                         label: "Plus".to_string(),
-                        ty: DeclarationId(2181),
+                        ty: DeclarationId(2204),
                     },
                     Field {
                         label: "Minus".to_string(),
-                        ty: DeclarationId(2182),
+                        ty: DeclarationId(2205),
                     },
                     Field {
                         label: "Star".to_string(),
-                        ty: DeclarationId(2183),
+                        ty: DeclarationId(2206),
                     },
                     Field {
                         label: "Slash".to_string(),
-                        ty: DeclarationId(2184),
+                        ty: DeclarationId(2207),
                     },
                     Field {
                         label: "AmpAmp".to_string(),
-                        ty: DeclarationId(2185),
+                        ty: DeclarationId(2208),
                     },
                     Field {
                         label: "PipePipe".to_string(),
-                        ty: DeclarationId(2186),
+                        ty: DeclarationId(2209),
                     },
                     Field {
                         label: "Colon".to_string(),
-                        ty: DeclarationId(2187),
+                        ty: DeclarationId(2210),
                     },
                     Field {
                         label: "Arrow".to_string(),
-                        ty: DeclarationId(2188),
+                        ty: DeclarationId(2211),
                     },
                     Field {
                         label: "FatArrow".to_string(),
-                        ty: DeclarationId(2189),
+                        ty: DeclarationId(2212),
                     },
                     Field {
                         label: "PipeArrow".to_string(),
-                        ty: DeclarationId(2190),
+                        ty: DeclarationId(2213),
                     },
                     Field {
                         label: "Dot".to_string(),
-                        ty: DeclarationId(2191),
+                        ty: DeclarationId(2214),
                     },
                     Field {
                         label: "LParen".to_string(),
-                        ty: DeclarationId(2192),
+                        ty: DeclarationId(2215),
                     },
                     Field {
                         label: "RParen".to_string(),
-                        ty: DeclarationId(2193),
+                        ty: DeclarationId(2216),
                     },
                     Field {
                         label: "LBrace".to_string(),
-                        ty: DeclarationId(2194),
+                        ty: DeclarationId(2217),
                     },
                     Field {
                         label: "RBrace".to_string(),
-                        ty: DeclarationId(2195),
+                        ty: DeclarationId(2218),
                     },
                     Field {
                         label: "LBracket".to_string(),
-                        ty: DeclarationId(2196),
+                        ty: DeclarationId(2219),
                     },
                     Field {
                         label: "RBracket".to_string(),
-                        ty: DeclarationId(2197),
+                        ty: DeclarationId(2220),
                     },
                     Field {
                         label: "Comma".to_string(),
-                        ty: DeclarationId(2198),
+                        ty: DeclarationId(2221),
                     },
                     Field {
                         label: "Semicolon".to_string(),
-                        ty: DeclarationId(2199),
+                        ty: DeclarationId(2222),
                     },
                     Field {
                         label: "Pipe".to_string(),
-                        ty: DeclarationId(2200),
+                        ty: DeclarationId(2223),
                     },
                     Field {
                         label: "Question".to_string(),
-                        ty: DeclarationId(2201),
+                        ty: DeclarationId(2224),
                     },
                 ],
             },
@@ -29916,7 +30138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2264, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1073),
+            id: DeclarationId(1080),
             name: Some("LocalPunctSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -29926,7 +30148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1072),
+                        ty: DeclarationId(1079),
                     },
                 ],
             },
@@ -29941,7 +30163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2780, 2844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1074),
+            id: DeclarationId(1081),
             name: Some("StringEscapeSpec".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -29966,7 +30188,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 3231, 3297),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1075),
+            id: DeclarationId(1082),
             name: Some("Path".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(131),
@@ -29983,7 +30205,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1076),
+            id: DeclarationId(1083),
             name: Some("SnapshotRef".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(123),
@@ -30000,7 +30222,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(1077),
+            id: DeclarationId(1084),
             name: Some("CensusListConstant".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30014,15 +30236,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(1078),
+            id: DeclarationId(1085),
             name: Some("expected_hand_authored_non_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1077),
+                template: DeclarationId(1084),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1077)),
+            meta_tag: Some(DeclarationId(1084)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -30031,15 +30253,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(1079),
+            id: DeclarationId(1086),
             name: Some("expected_hand_authored_test".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1077),
+                template: DeclarationId(1084),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1077)),
+            meta_tag: Some(DeclarationId(1084)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -30048,7 +30270,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(1080),
+            id: DeclarationId(1087),
             name: Some("LensProducerFilesSubsetPredicate".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30062,15 +30284,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(1081),
+            id: DeclarationId(1088),
             name: Some("lens_producer_files_subset_predicate".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1080),
+                template: DeclarationId(1087),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1080)),
+            meta_tag: Some(DeclarationId(1087)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -30079,7 +30301,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(1082),
+            id: DeclarationId(1089),
             name: Some("CompilerStdPositiveSetRatchet".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30093,15 +30315,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(1083),
+            id: DeclarationId(1090),
             name: Some("compiler_std_positive_set_ratchet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1082),
+                template: DeclarationId(1089),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1082)),
+            meta_tag: Some(DeclarationId(1089)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural { fields: vec![] }),
@@ -30110,49 +30332,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(1084),
+            id: DeclarationId(1091),
             name: Some("DiagnosticKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TokenizerError".to_string(),
-                        ty: DeclarationId(2205),
+                        ty: DeclarationId(2228),
                     },
                     Field {
                         label: "ParseError".to_string(),
-                        ty: DeclarationId(2206),
+                        ty: DeclarationId(2229),
                     },
                     Field {
                         label: "TypeMismatch".to_string(),
-                        ty: DeclarationId(2207),
+                        ty: DeclarationId(2230),
                     },
                     Field {
                         label: "ArityMismatch".to_string(),
-                        ty: DeclarationId(2208),
+                        ty: DeclarationId(2231),
                     },
                     Field {
                         label: "ResolveError".to_string(),
-                        ty: DeclarationId(2209),
+                        ty: DeclarationId(2232),
                     },
                     Field {
                         label: "UnitMismatch".to_string(),
-                        ty: DeclarationId(2210),
+                        ty: DeclarationId(2233),
                     },
                     Field {
                         label: "BranchConditionNotBool".to_string(),
-                        ty: DeclarationId(2211),
+                        ty: DeclarationId(2234),
                     },
                     Field {
                         label: "MagnitudeOutOfRange".to_string(),
-                        ty: DeclarationId(2212),
+                        ty: DeclarationId(2235),
                     },
                     Field {
                         label: "MalformedIntegerRangeFact".to_string(),
-                        ty: DeclarationId(2213),
+                        ty: DeclarationId(2236),
                     },
                     Field {
                         label: "NominalOpacityViolation".to_string(),
-                        ty: DeclarationId(2214),
+                        ty: DeclarationId(2237),
                     },
                 ],
             },
@@ -30167,17 +30389,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(1085),
+            id: DeclarationId(1092),
             name: Some("DiagnosticDetailExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "AnyDetail".to_string(),
-                        ty: DeclarationId(2215),
+                        ty: DeclarationId(2238),
                     },
                     Field {
                         label: "Contains".to_string(),
-                        ty: DeclarationId(2216),
+                        ty: DeclarationId(2239),
                     },
                 ],
             },
@@ -30192,17 +30414,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(1086),
+            id: DeclarationId(1093),
             name: Some("DiagnosticReference".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "kind".to_string(),
-                        ty: DeclarationId(1084),
+                        ty: DeclarationId(1091),
                     },
                     Field {
                         label: "detail_contains".to_string(),
-                        ty: DeclarationId(1085),
+                        ty: DeclarationId(1092),
                     },
                 ],
             },
@@ -30217,17 +30439,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(1087),
+            id: DeclarationId(1094),
             name: Some("PortStateExpectation".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Resolved".to_string(),
-                        ty: DeclarationId(2217),
+                        ty: DeclarationId(2240),
                     },
                     Field {
                         label: "Unresolved".to_string(),
-                        ty: DeclarationId(2218),
+                        ty: DeclarationId(2241),
                     },
                 ],
             },
@@ -30242,21 +30464,21 @@ 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(1088),
+            id: DeclarationId(1095),
             name: Some("AlgebraicLawKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Associativity".to_string(),
-                        ty: DeclarationId(2219),
+                        ty: DeclarationId(2242),
                     },
                     Field {
                         label: "Commutativity".to_string(),
-                        ty: DeclarationId(2220),
+                        ty: DeclarationId(2243),
                     },
                     Field {
                         label: "Identity".to_string(),
-                        ty: DeclarationId(2221),
+                        ty: DeclarationId(2244),
                     },
                 ],
             },
@@ -30271,101 +30493,101 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4594, 4664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1089),
+            id: DeclarationId(1096),
             name: Some("TestPredicate".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "Compiles".to_string(),
-                        ty: DeclarationId(2222),
+                        ty: DeclarationId(2245),
                     },
                     Field {
                         label: "FailsWithDiagnostic".to_string(),
-                        ty: DeclarationId(2223),
+                        ty: DeclarationId(2246),
                     },
                     Field {
                         label: "OutputEquals".to_string(),
-                        ty: DeclarationId(2224),
+                        ty: DeclarationId(2247),
                     },
                     Field {
                         label: "PortHasState".to_string(),
-                        ty: DeclarationId(2225),
+                        ty: DeclarationId(2248),
                     },
                     Field {
                         label: "DeclarationHasRefinement".to_string(),
-                        ty: DeclarationId(2226),
+                        ty: DeclarationId(2249),
                     },
                     Field {
                         label: "CostBounded".to_string(),
-                        ty: DeclarationId(2227),
+                        ty: DeclarationId(2250),
                     },
                     Field {
                         label: "BehavioralObservation".to_string(),
-                        ty: DeclarationId(2228),
+                        ty: DeclarationId(2251),
                     },
                     Field {
                         label: "MockBackedInvariant".to_string(),
-                        ty: DeclarationId(2229),
+                        ty: DeclarationId(2252),
                     },
                     Field {
                         label: "ExecuteCommand".to_string(),
-                        ty: DeclarationId(2231),
+                        ty: DeclarationId(2254),
                     },
                     Field {
                         label: "ForAllTargets".to_string(),
-                        ty: DeclarationId(2233),
+                        ty: DeclarationId(2256),
                     },
                     Field {
                         label: "LensOutputEquals".to_string(),
-                        ty: DeclarationId(2234),
+                        ty: DeclarationId(2257),
                     },
                     Field {
                         label: "DifferentialEquals".to_string(),
-                        ty: DeclarationId(2235),
+                        ty: DeclarationId(2258),
                     },
                     Field {
                         label: "SymbolicCostExprEquals".to_string(),
-                        ty: DeclarationId(2236),
+                        ty: DeclarationId(2259),
                     },
                     Field {
                         label: "BinaryDimensionReportEquals".to_string(),
-                        ty: DeclarationId(2237),
+                        ty: DeclarationId(2260),
                     },
                     Field {
                         label: "AlgebraicLaw".to_string(),
-                        ty: DeclarationId(2238),
+                        ty: DeclarationId(2261),
                     },
                     Field {
                         label: "CensusBoundCheck".to_string(),
-                        ty: DeclarationId(2239),
+                        ty: DeclarationId(2262),
                     },
                     Field {
                         label: "CensusSubsetCount".to_string(),
-                        ty: DeclarationId(2240),
+                        ty: DeclarationId(2263),
                     },
                     Field {
                         label: "FixedPointConverges".to_string(),
-                        ty: DeclarationId(2241),
+                        ty: DeclarationId(2264),
                     },
                     Field {
                         label: "RatchetZero".to_string(),
-                        ty: DeclarationId(2242),
+                        ty: DeclarationId(2265),
                     },
                     Field {
                         label: "GeneratedFromDag".to_string(),
-                        ty: DeclarationId(2244),
+                        ty: DeclarationId(2267),
                     },
                     Field {
                         label: "ReleaseDeferredClaim".to_string(),
-                        ty: DeclarationId(2245),
+                        ty: DeclarationId(2268),
                     },
                     Field {
                         label: "SubstrateResearchDeferredClaim".to_string(),
-                        ty: DeclarationId(2246),
+                        ty: DeclarationId(2269),
                     },
                     Field {
                         label: "BridgeLedgerZero".to_string(),
-                        ty: DeclarationId(2247),
+                        ty: DeclarationId(2270),
                     },
                 ],
             },
@@ -30380,7 +30602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4666, 15001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1090),
+            id: DeclarationId(1097),
             name: Some("ProgramInput".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30394,12 +30616,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 15109, 15129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1091),
+            id: DeclarationId(1098),
             name: Some("ProgramOutputBind".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "output_ref".to_string(),
-                    ty: DeclarationId(1105),
+                    ty: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -30413,7 +30635,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 15272, 15327),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1092),
+            id: DeclarationId(1099),
             name: Some("TestClaim".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -30431,11 +30653,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "predicate".to_string(),
-                        ty: DeclarationId(1089),
+                        ty: DeclarationId(1096),
                     },
                     Field {
                         label: "requires".to_string(),
-                        ty: DeclarationId(2248),
+                        ty: DeclarationId(2271),
                     },
                 ],
             },
@@ -30450,7 +30672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 15937, 16070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1093),
+            id: DeclarationId(1100),
             name: Some("TestSuite".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -30460,7 +30682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "claims".to_string(),
-                        ty: DeclarationId(2249),
+                        ty: DeclarationId(2272),
                     },
                 ],
             },
@@ -30475,7 +30697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16072, 16131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1094),
+            id: DeclarationId(1101),
             name: Some("TestObligation".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -30485,7 +30707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "resources".to_string(),
-                        ty: DeclarationId(2250),
+                        ty: DeclarationId(2273),
                     },
                 ],
             },
@@ -30500,11 +30722,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16329, 16410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1095),
+            id: DeclarationId(1102),
             name: Some("claim_obligation_resources".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1092)],
-                output: DeclarationId(2202),
+                inputs: vec![DeclarationId(1099)],
+                output: DeclarationId(2225),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     16852,
@@ -30522,11 +30744,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16781, 16868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1096),
+            id: DeclarationId(1103),
             name: Some("obligation_for_claim".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1092)],
-                output: DeclarationId(1094),
+                inputs: vec![DeclarationId(1099)],
+                output: DeclarationId(1101),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     16926,
@@ -30544,11 +30766,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16870, 17011),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1097),
+            id: DeclarationId(1104),
             name: Some("materialize_test_obligations".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(2203)],
-                output: DeclarationId(2204),
+                inputs: vec![DeclarationId(2226)],
+                output: DeclarationId(2227),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/std/verification.dag",
                     17094,
@@ -30566,11 +30788,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17013, 17133),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1098),
+            id: DeclarationId(1105),
             name: Some("behavior_spine".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747)],
-                output: DeclarationId(2251),
+                output: DeclarationId(2274),
                 body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(280))),
             },
             type_params: vec![],
@@ -30584,7 +30806,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(1099),
+            id: DeclarationId(1106),
             name: Some("ValueBehavior".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30598,7 +30820,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(1100),
+            id: DeclarationId(1107),
             name: Some("Transform".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30612,7 +30834,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(1101),
+            id: DeclarationId(1108),
             name: Some("Branch".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30626,7 +30848,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(1102),
+            id: DeclarationId(1109),
             name: Some("Loop".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30640,7 +30862,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(1103),
+            id: DeclarationId(1110),
             name: Some("Bind".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30654,7 +30876,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(1104),
+            id: DeclarationId(1111),
             name: Some("Main".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30668,7 +30890,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(1105),
+            id: DeclarationId(1112),
             name: Some("DeclarationRef".to_string()),
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -30682,7 +30904,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1106),
+            id: DeclarationId(1113),
             name: Some("go_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(867),
@@ -30698,14 +30920,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1937),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1933),
+                            constructor: DeclarationId(1940),
                             payload: vec![],
                         },
                     ),
@@ -30716,7 +30938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2050, 2152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1107),
+            id: DeclarationId(1114),
             name: Some("go_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(869),
@@ -30746,7 +30968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2154, 2304),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1108),
+            id: DeclarationId(1115),
             name: Some("go_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(871),
@@ -30767,22 +30989,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2306, 2381),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1109),
+            id: DeclarationId(1116),
             name: Some("go_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -30805,22 +31027,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2383, 2513),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1110),
+            id: DeclarationId(1117),
             name: Some("go_int32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -30843,22 +31065,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2515, 2649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1111),
+            id: DeclarationId(1118),
             name: Some("go_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -30871,15 +31093,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(2015),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1622),
+                                constructor: DeclarationId(1629),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1621),
+                                        constructor: DeclarationId(1628),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1619),
+                                            constructor: DeclarationId(1626),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -30891,7 +31113,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1110)),
+                        FieldValue::Reference(DeclarationId(1117)),
                     ),
                 ],
             }),
@@ -30900,22 +31122,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2651, 2954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1112),
+            id: DeclarationId(1119),
             name: Some("go_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -30938,22 +31160,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 2956, 3087),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1113),
+            id: DeclarationId(1120),
             name: Some("go_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -30976,22 +31198,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3089, 3226),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1114),
+            id: DeclarationId(1121),
             name: Some("go_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31014,22 +31236,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3228, 3366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1115),
+            id: DeclarationId(1122),
             name: Some("go_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31052,22 +31274,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3368, 3506),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1116),
+            id: DeclarationId(1123),
             name: Some("go_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31090,22 +31312,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3508, 3667),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1117),
+            id: DeclarationId(1124),
             name: Some("go_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31128,22 +31350,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3669, 3816),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1118),
+            id: DeclarationId(1125),
             name: Some("go_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31167,7 +31389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1993),
+                                    constructor: DeclarationId(2016),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -31187,22 +31409,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 3818, 4059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1119),
+            id: DeclarationId(1126),
             name: Some("go_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31225,22 +31447,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4061, 4209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1120),
+            id: DeclarationId(1127),
             name: Some("go_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31265,7 +31487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -31284,7 +31506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state".to_string(),
                                         ))],
@@ -31305,7 +31527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -31326,22 +31548,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4211, 4594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1121),
+            id: DeclarationId(1128),
             name: Some("go_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31366,7 +31588,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -31385,7 +31607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -31404,7 +31626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -31425,22 +31647,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4596, 4990),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1122),
+            id: DeclarationId(1129),
             name: Some("go_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31463,22 +31685,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 4992, 5146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1123),
+            id: DeclarationId(1130),
             name: Some("go_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31501,22 +31723,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5148, 5302),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1124),
+            id: DeclarationId(1131),
             name: Some("go_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31539,22 +31761,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5304, 5473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1125),
+            id: DeclarationId(1132),
             name: Some("go_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31577,22 +31799,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5475, 5619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1126),
+            id: DeclarationId(1133),
             name: Some("go_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31617,22 +31839,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5621, 5806),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1127),
+            id: DeclarationId(1134),
             name: Some("go_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31655,22 +31877,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5808, 5968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1128),
+            id: DeclarationId(1135),
             name: Some("go_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31695,7 +31917,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -31714,7 +31936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -31735,22 +31957,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 5970, 6272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1129),
+            id: DeclarationId(1136),
             name: Some("go_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31777,7 +31999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -31796,7 +32018,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -31817,22 +32039,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6274, 6611),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1130),
+            id: DeclarationId(1137),
             name: Some("go_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31859,7 +32081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -31878,7 +32100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -31899,22 +32121,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6613, 6954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1131),
+            id: DeclarationId(1138),
             name: Some("go_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -31940,7 +32162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1993),
+                                    constructor: DeclarationId(2016),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -31960,22 +32182,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 6956, 7228),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1132),
+            id: DeclarationId(1139),
             name: Some("go_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32000,7 +32222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -32019,7 +32241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -32040,22 +32262,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 7230, 7541),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1133),
+            id: DeclarationId(1140),
             name: Some("go_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32080,7 +32302,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -32099,7 +32321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -32120,22 +32342,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 7543, 7859),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1134),
+            id: DeclarationId(1141),
             name: Some("go_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32160,7 +32382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -32179,7 +32401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -32198,7 +32420,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -32219,22 +32441,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 7861, 8270),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1135),
+            id: DeclarationId(1142),
             name: Some("go_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32259,7 +32481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -32278,7 +32500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -32299,22 +32521,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 8272, 8588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1136),
+            id: DeclarationId(1143),
             name: Some("go_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32338,7 +32560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1994),
+                                    constructor: DeclarationId(2017),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -32358,22 +32580,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 8590, 8831),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1137),
+            id: DeclarationId(1144),
             name: Some("go_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32397,7 +32619,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1993),
+                                    constructor: DeclarationId(2016),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -32417,22 +32639,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 8833, 9074),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1138),
+            id: DeclarationId(1145),
             name: Some("go_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32456,7 +32678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1993),
+                                    constructor: DeclarationId(2016),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -32476,22 +32698,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9076, 9335),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1139),
+            id: DeclarationId(1146),
             name: Some("go_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32516,7 +32738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -32537,7 +32759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -32558,22 +32780,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9337, 9670),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1140),
+            id: DeclarationId(1147),
             name: Some("go_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32596,22 +32818,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9672, 9823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1141),
+            id: DeclarationId(1148),
             name: Some("go_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32634,22 +32856,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9825, 9973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1142),
+            id: DeclarationId(1149),
             name: Some("go_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32672,22 +32894,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 9975, 10123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1143),
+            id: DeclarationId(1150),
             name: Some("go_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32710,22 +32932,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 10125, 10288),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1144),
+            id: DeclarationId(1151),
             name: Some("go_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32750,7 +32972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -32769,7 +32991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -32790,7 +33012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -32811,7 +33033,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -32832,7 +33054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -32853,7 +33075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -32874,7 +33096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -32895,7 +33117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -32916,7 +33138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -32935,7 +33157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -32956,22 +33178,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 10290, 11307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1145),
+            id: DeclarationId(1152),
             name: Some("go_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -32994,22 +33216,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11309, 11466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1146),
+            id: DeclarationId(1153),
             name: Some("go_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33032,22 +33254,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11468, 11625),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1147),
+            id: DeclarationId(1154),
             name: Some("go_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33070,22 +33292,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11627, 11775),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1148),
+            id: DeclarationId(1155),
             name: Some("go_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33108,22 +33330,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11777, 11934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1149),
+            id: DeclarationId(1156),
             name: Some("go_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33146,22 +33368,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 11936, 12102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1150),
+            id: DeclarationId(1157),
             name: Some("go_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33184,22 +33406,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12104, 12264),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1151),
+            id: DeclarationId(1158),
             name: Some("go_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33226,7 +33448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -33247,7 +33469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -33268,22 +33490,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12266, 12617),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1152),
+            id: DeclarationId(1159),
             name: Some("go_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33308,7 +33530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -33329,7 +33551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33348,7 +33570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -33367,7 +33589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -33388,22 +33610,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 12619, 13106),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1153),
+            id: DeclarationId(1160),
             name: Some("go_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33426,22 +33648,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 13108, 13256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1154),
+            id: DeclarationId(1161),
             name: Some("go_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33466,7 +33688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33485,7 +33707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload".to_string(),
                                         ))],
@@ -33506,7 +33728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33525,7 +33747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33546,22 +33768,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 13730, 14204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1155),
+            id: DeclarationId(1162),
             name: Some("go_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33586,7 +33808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33605,7 +33827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -33624,7 +33846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -33645,7 +33867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33664,7 +33886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33685,22 +33907,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 14206, 14771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1156),
+            id: DeclarationId(1163),
             name: Some("go_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33725,7 +33947,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33744,7 +33966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -33763,7 +33985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -33784,7 +34006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -33803,7 +34025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -33824,7 +34046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -33845,22 +34067,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 14773, 15430),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1157),
+            id: DeclarationId(1164),
             name: Some("go_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -33885,7 +34107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -33904,7 +34126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -33923,7 +34145,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -33942,7 +34164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -33961,7 +34183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -33982,7 +34204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34001,7 +34223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34022,22 +34244,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 15432, 16134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1158),
+            id: DeclarationId(1165),
             name: Some("go_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34062,7 +34284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -34081,7 +34303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -34102,7 +34324,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -34121,7 +34343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -34140,7 +34362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -34161,7 +34383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -34182,22 +34404,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 16136, 16787),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1159),
+            id: DeclarationId(1166),
             name: Some("go_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34220,22 +34442,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 16789, 16933),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1160),
+            id: DeclarationId(1167),
             name: Some("go_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34262,7 +34484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -34281,7 +34503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -34300,7 +34522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -34321,7 +34543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -34342,15 +34564,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 16935, 17402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1161),
+            id: DeclarationId(1168),
             name: Some("go_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34363,15 +34585,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 17705, 17946),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1162),
+            id: DeclarationId(1169),
             name: Some("go_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34384,15 +34606,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 17948, 18102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1163),
+            id: DeclarationId(1170),
             name: Some("go_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34405,15 +34627,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 18104, 18502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1164),
+            id: DeclarationId(1171),
             name: Some("go_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34426,15 +34648,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 18504, 18813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1165),
+            id: DeclarationId(1172),
             name: Some("go_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34447,15 +34669,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 18815, 19217),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1166),
+            id: DeclarationId(1173),
             name: Some("go_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34468,15 +34690,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 19219, 19382),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1167),
+            id: DeclarationId(1174),
             name: Some("go_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34489,15 +34711,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 19384, 19538),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1168),
+            id: DeclarationId(1175),
             name: Some("go_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34510,15 +34732,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 19540, 19951),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1169),
+            id: DeclarationId(1176),
             name: Some("go_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34531,15 +34753,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 19953, 20438),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1170),
+            id: DeclarationId(1177),
             name: Some("go_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34552,15 +34774,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 20440, 20846),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1171),
+            id: DeclarationId(1178),
             name: Some("go_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34573,15 +34795,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 20848, 21266),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1172),
+            id: DeclarationId(1179),
             name: Some("go_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34594,15 +34816,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21268, 21431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1173),
+            id: DeclarationId(1180),
             name: Some("go_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34615,15 +34837,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21433, 21596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1174),
+            id: DeclarationId(1181),
             name: Some("go_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -34636,22 +34858,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21598, 21752),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1175),
+            id: DeclarationId(1182),
             name: Some("go_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34670,22 +34892,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21754, 21895),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1176),
+            id: DeclarationId(1183),
             name: Some("go_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34704,22 +34926,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 21897, 22038),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1177),
+            id: DeclarationId(1184),
             name: Some("go_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34738,22 +34960,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22040, 22181),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1178),
+            id: DeclarationId(1185),
             name: Some("go_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34774,22 +34996,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22183, 22331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1179),
+            id: DeclarationId(1186),
             name: Some("go_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34808,22 +35030,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22333, 22473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1180),
+            id: DeclarationId(1187),
             name: Some("go_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34842,22 +35064,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22475, 22622),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1181),
+            id: DeclarationId(1188),
             name: Some("go_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34876,22 +35098,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22624, 22771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1182),
+            id: DeclarationId(1189),
             name: Some("go_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34910,22 +35132,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22773, 22934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1183),
+            id: DeclarationId(1190),
             name: Some("go_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34944,22 +35166,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 22936, 23076),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1184),
+            id: DeclarationId(1191),
             name: Some("go_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -34978,22 +35200,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23078, 23225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1185),
+            id: DeclarationId(1192),
             name: Some("go_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35012,22 +35234,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23227, 23374),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1186),
+            id: DeclarationId(1193),
             name: Some("go_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35046,22 +35268,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23376, 23537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1187),
+            id: DeclarationId(1194),
             name: Some("go_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35080,22 +35302,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23539, 23678),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1188),
+            id: DeclarationId(1195),
             name: Some("go_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35114,22 +35336,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23680, 23820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1189),
+            id: DeclarationId(1196),
             name: Some("go_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35148,22 +35370,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23822, 23961),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1190),
+            id: DeclarationId(1197),
             name: Some("go_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35182,22 +35404,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 23963, 24103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1191),
+            id: DeclarationId(1198),
             name: Some("go_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35216,22 +35438,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24105, 24254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1192),
+            id: DeclarationId(1199),
             name: Some("go_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35250,26 +35472,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24256, 24405),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1193),
+            id: DeclarationId(1200),
             name: Some("go_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1103)),
+                        FieldValue::Reference(DeclarationId(1110)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35285,26 +35507,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24407, 24540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1194),
+            id: DeclarationId(1201),
             name: Some("go_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1101)),
+                        FieldValue::Reference(DeclarationId(1108)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35320,26 +35542,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24542, 24685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1195),
+            id: DeclarationId(1202),
             name: Some("go_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1104)),
+                        FieldValue::Reference(DeclarationId(1111)),
                     ),
                     (
                         "carrier".to_string(),
@@ -35355,22 +35577,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24687, 24840),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1196),
+            id: DeclarationId(1203),
             name: Some("go_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35379,7 +35601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2029),
                             payload: vec![],
                         },
                     ),
@@ -35392,22 +35614,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24842, 24980),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1197),
+            id: DeclarationId(1204),
             name: Some("go_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35416,7 +35638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2030),
                             payload: vec![],
                         },
                     ),
@@ -35427,7 +35649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1997),
+                                    constructor: DeclarationId(2020),
                                     payload: vec![],
                                 },
                             ),
@@ -35441,22 +35663,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 24982, 25174),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1198),
+            id: DeclarationId(1205),
             name: Some("go_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35465,7 +35687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2008),
+                            constructor: DeclarationId(2031),
                             payload: vec![],
                         },
                     ),
@@ -35477,7 +35699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -35487,7 +35709,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -35502,22 +35724,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25176, 25393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1199),
+            id: DeclarationId(1206),
             name: Some("go_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35526,7 +35748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2009),
+                            constructor: DeclarationId(2032),
                             payload: vec![],
                         },
                     ),
@@ -35538,7 +35760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -35548,7 +35770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -35563,22 +35785,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25395, 25618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1200),
+            id: DeclarationId(1207),
             name: Some("go_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35587,7 +35809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2033),
                             payload: vec![],
                         },
                     ),
@@ -35598,7 +35820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1996),
+                                    constructor: DeclarationId(2019),
                                     payload: vec![],
                                 },
                             ),
@@ -35612,22 +35834,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25620, 25803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1201),
+            id: DeclarationId(1208),
             name: Some("go_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35645,22 +35867,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 25805, 25941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1202),
+            id: DeclarationId(1209),
             name: Some("go_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35680,22 +35902,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26627, 26780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1203),
+            id: DeclarationId(1210),
             name: Some("go_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35713,22 +35935,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26782, 26922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1204),
+            id: DeclarationId(1211),
             name: Some("go_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35737,7 +35959,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2034),
                             payload: vec![],
                         },
                     ),
@@ -35748,7 +35970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1996),
+                                    constructor: DeclarationId(2019),
                                     payload: vec![],
                                 },
                             ),
@@ -35762,22 +35984,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 26924, 27112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1205),
+            id: DeclarationId(1212),
             name: Some("go_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35786,7 +36008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2012),
+                            constructor: DeclarationId(2035),
                             payload: vec![],
                         },
                     ),
@@ -35798,7 +36020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -35808,7 +36030,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -35818,7 +36040,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -35833,22 +36055,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27114, 27371),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1206),
+            id: DeclarationId(1213),
             name: Some("go_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35857,7 +36079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2013),
+                            constructor: DeclarationId(2036),
                             payload: vec![],
                         },
                     ),
@@ -35869,7 +36091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -35879,7 +36101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -35894,22 +36116,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27373, 27587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1207),
+            id: DeclarationId(1214),
             name: Some("go_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35918,7 +36140,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2014),
+                            constructor: DeclarationId(2037),
                             payload: vec![],
                         },
                     ),
@@ -35930,7 +36152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -35940,7 +36162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -35955,22 +36177,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27589, 27812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1208),
+            id: DeclarationId(1215),
             name: Some("go_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -35979,7 +36201,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2015),
+                            constructor: DeclarationId(2038),
                             payload: vec![],
                         },
                     ),
@@ -35991,7 +36213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -36001,7 +36223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -36016,22 +36238,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 27814, 28043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1209),
+            id: DeclarationId(1216),
             name: Some("go_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "target".to_string(),
@@ -36040,17 +36262,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2017),
+                            constructor: DeclarationId(2040),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1528)),
+                        FieldValue::Reference(DeclarationId(1535)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1530)),
+                        FieldValue::Reference(DeclarationId(1537)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -36080,15 +36302,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28130, 28436),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1210),
+            id: DeclarationId(1217),
             name: Some("go_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(927),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(927)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36110,15 +36332,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28438, 28568),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1211),
+            id: DeclarationId(1218),
             name: Some("go_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(935),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(935)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36144,15 +36366,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28570, 28730),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1212),
+            id: DeclarationId(1219),
             name: Some("go_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(937),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(937)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36189,15 +36411,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28732, 28933),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1213),
+            id: DeclarationId(1220),
             name: Some("go_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(931),
+                template: DeclarationId(938),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(931)),
+            meta_tag: Some(DeclarationId(938)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36221,15 +36443,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 28935, 29045),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1214),
+            id: DeclarationId(1221),
             name: Some("go_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(939),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(939)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36243,15 +36465,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29047, 29104),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1215),
+            id: DeclarationId(1222),
             name: Some("go_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(933),
+                template: DeclarationId(940),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(933)),
+            meta_tag: Some(DeclarationId(940)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36289,15 +36511,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29106, 29391),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1216),
+            id: DeclarationId(1223),
             name: Some("go_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(934),
+                template: DeclarationId(941),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(934)),
+            meta_tag: Some(DeclarationId(941)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36311,15 +36533,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29393, 29472),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1217),
+            id: DeclarationId(1224),
             name: Some("go_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(935),
+                template: DeclarationId(942),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(935)),
+            meta_tag: Some(DeclarationId(942)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36355,15 +36577,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29474, 29697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1218),
+            id: DeclarationId(1225),
             name: Some("go_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(937),
+                template: DeclarationId(944),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(937)),
+            meta_tag: Some(DeclarationId(944)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36409,54 +36631,54 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29699, 29991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1219),
+            id: DeclarationId(1226),
             name: Some("go_collection_ops".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(938),
+                template: DeclarationId(945),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(938)),
+            meta_tag: Some(DeclarationId(945)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "concat_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(950)),
+                        FieldValue::Reference(DeclarationId(957)),
                     ),
                     (
                         "length_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(951)),
+                        FieldValue::Reference(DeclarationId(958)),
                     ),
                     (
                         "is_empty_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(952)),
+                        FieldValue::Reference(DeclarationId(959)),
                     ),
                     (
                         "fold_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(953)),
+                        FieldValue::Reference(DeclarationId(960)),
                     ),
                     (
                         "filter_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(955)),
+                        FieldValue::Reference(DeclarationId(962)),
                     ),
                     (
                         "flat_map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(958)),
+                        FieldValue::Reference(DeclarationId(965)),
                     ),
                     (
                         "any_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(956)),
+                        FieldValue::Reference(DeclarationId(963)),
                     ),
                     (
                         "all_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(957)),
+                        FieldValue::Reference(DeclarationId(964)),
                     ),
                     (
                         "map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(954)),
+                        FieldValue::Reference(DeclarationId(961)),
                     ),
                     (
                         "filter".to_string(),
@@ -36493,15 +36715,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 29993, 30758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1220),
+            id: DeclarationId(1227),
             name: Some("go_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(939),
+                template: DeclarationId(946),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(939)),
+            meta_tag: Some(DeclarationId(946)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36537,15 +36759,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 30760, 31028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1221),
+            id: DeclarationId(1228),
             name: Some("go_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(936),
+                template: DeclarationId(943),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(936)),
+            meta_tag: Some(DeclarationId(943)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36565,66 +36787,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 31785, 31900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1222),
+            id: DeclarationId(1229),
             name: Some("go_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(943),
+                template: DeclarationId(950),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(943)),
+            meta_tag: Some(DeclarationId(950)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1210)),
+                        FieldValue::Reference(DeclarationId(1217)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1211)),
+                        FieldValue::Reference(DeclarationId(1218)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1212)),
+                        FieldValue::Reference(DeclarationId(1219)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1213)),
+                        FieldValue::Reference(DeclarationId(1220)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1214)),
+                        FieldValue::Reference(DeclarationId(1221)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1215)),
+                        FieldValue::Reference(DeclarationId(1222)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1216)),
+                        FieldValue::Reference(DeclarationId(1223)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1217)),
+                        FieldValue::Reference(DeclarationId(1224)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1221)),
+                        FieldValue::Reference(DeclarationId(1228)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1218)),
+                        FieldValue::Reference(DeclarationId(1225)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1219)),
+                        FieldValue::Reference(DeclarationId(1226)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1220)),
+                        FieldValue::Reference(DeclarationId(1227)),
                     ),
                 ],
             }),
@@ -36633,7 +36855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 31902, 32321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1223),
+            id: DeclarationId(1230),
             name: Some("go_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(841),
@@ -36669,7 +36891,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 33988, 34124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1224),
+            id: DeclarationId(1231),
             name: Some("go_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(832),
@@ -36685,55 +36907,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1866),
+                            constructor: DeclarationId(1873),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1869),
+                            constructor: DeclarationId(1876),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1875),
+                            constructor: DeclarationId(1882),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1879),
+                            constructor: DeclarationId(1886),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1881),
+                            constructor: DeclarationId(1888),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1885),
+                            constructor: DeclarationId(1892),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1223)),
+                        FieldValue::Reference(DeclarationId(1230)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -36759,7 +36981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1888),
+                                    constructor: DeclarationId(1895),
                                     payload: vec![],
                                 },
                             ),
@@ -36772,7 +36994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 34126, 34684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1225),
+            id: DeclarationId(1232),
             name: Some("go_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(833),
@@ -36787,11 +37009,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1222)),
+                        FieldValue::Reference(DeclarationId(1229)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1224)),
+                        FieldValue::Reference(DeclarationId(1231)),
                     ),
                 ],
             }),
@@ -36800,15 +37022,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/go.dag", 34686, 34810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1226),
+            id: DeclarationId(1233),
             name: Some("python_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(927),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(927)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36828,15 +37050,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(1227),
+            id: DeclarationId(1234),
             name: Some("python_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(935),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(935)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36862,15 +37084,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(1228),
+            id: DeclarationId(1235),
             name: Some("python_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(937),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(937)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36907,15 +37129,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(1229),
+            id: DeclarationId(1236),
             name: Some("python_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(931),
+                template: DeclarationId(938),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(931)),
+            meta_tag: Some(DeclarationId(938)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36939,15 +37161,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(1230),
+            id: DeclarationId(1237),
             name: Some("python_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(939),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(939)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -36961,15 +37183,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(1231),
+            id: DeclarationId(1238),
             name: Some("python_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(933),
+                template: DeclarationId(940),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(933)),
+            meta_tag: Some(DeclarationId(940)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37007,15 +37229,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(1232),
+            id: DeclarationId(1239),
             name: Some("python_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(934),
+                template: DeclarationId(941),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(934)),
+            meta_tag: Some(DeclarationId(941)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37031,15 +37253,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(1233),
+            id: DeclarationId(1240),
             name: Some("python_type_definitions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(935),
+                template: DeclarationId(942),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(935)),
+            meta_tag: Some(DeclarationId(942)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37079,15 +37301,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(1234),
+            id: DeclarationId(1241),
             name: Some("python_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(937),
+                template: DeclarationId(944),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(937)),
+            meta_tag: Some(DeclarationId(944)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37133,54 +37355,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(1235),
+            id: DeclarationId(1242),
             name: Some("python_collections".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(938),
+                template: DeclarationId(945),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(938)),
+            meta_tag: Some(DeclarationId(945)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "concat_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1021)),
+                        FieldValue::Reference(DeclarationId(1028)),
                     ),
                     (
                         "length_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1022)),
+                        FieldValue::Reference(DeclarationId(1029)),
                     ),
                     (
                         "is_empty_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1023)),
+                        FieldValue::Reference(DeclarationId(1030)),
                     ),
                     (
                         "fold_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1024)),
+                        FieldValue::Reference(DeclarationId(1031)),
                     ),
                     (
                         "filter_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1026)),
+                        FieldValue::Reference(DeclarationId(1033)),
                     ),
                     (
                         "flat_map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1029)),
+                        FieldValue::Reference(DeclarationId(1036)),
                     ),
                     (
                         "any_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1027)),
+                        FieldValue::Reference(DeclarationId(1034)),
                     ),
                     (
                         "all_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1028)),
+                        FieldValue::Reference(DeclarationId(1035)),
                     ),
                     (
                         "map_contract".to_string(),
-                        FieldValue::Reference(DeclarationId(1025)),
+                        FieldValue::Reference(DeclarationId(1032)),
                     ),
                     (
                         "filter".to_string(),
@@ -37211,15 +37433,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(1236),
+            id: DeclarationId(1243),
             name: Some("python_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(939),
+                template: DeclarationId(946),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(939)),
+            meta_tag: Some(DeclarationId(946)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37251,15 +37473,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(1237),
+            id: DeclarationId(1244),
             name: Some("python_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(936),
+                template: DeclarationId(943),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(936)),
+            meta_tag: Some(DeclarationId(943)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -37279,66 +37501,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(1238),
+            id: DeclarationId(1245),
             name: Some("python_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(943),
+                template: DeclarationId(950),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(943)),
+            meta_tag: Some(DeclarationId(950)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1226)),
+                        FieldValue::Reference(DeclarationId(1233)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1227)),
+                        FieldValue::Reference(DeclarationId(1234)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1228)),
+                        FieldValue::Reference(DeclarationId(1235)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1229)),
+                        FieldValue::Reference(DeclarationId(1236)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1230)),
+                        FieldValue::Reference(DeclarationId(1237)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1231)),
+                        FieldValue::Reference(DeclarationId(1238)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1232)),
+                        FieldValue::Reference(DeclarationId(1239)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1233)),
+                        FieldValue::Reference(DeclarationId(1240)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1237)),
+                        FieldValue::Reference(DeclarationId(1244)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1234)),
+                        FieldValue::Reference(DeclarationId(1241)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1235)),
+                        FieldValue::Reference(DeclarationId(1242)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1236)),
+                        FieldValue::Reference(DeclarationId(1243)),
                     ),
                 ],
             }),
@@ -37347,7 +37569,7 @@ 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(1239),
+            id: DeclarationId(1246),
             name: Some("python_target".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(867),
@@ -37363,14 +37585,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1930),
+                            constructor: DeclarationId(1937),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1933),
+                            constructor: DeclarationId(1940),
                             payload: vec![],
                         },
                     ),
@@ -37381,7 +37603,7 @@ 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(1240),
+            id: DeclarationId(1247),
             name: Some("python_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(869),
@@ -37409,7 +37631,7 @@ 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(1241),
+            id: DeclarationId(1248),
             name: Some("python_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(871),
@@ -37430,22 +37652,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(1242),
+            id: DeclarationId(1249),
             name: Some("python_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37468,22 +37690,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(1243),
+            id: DeclarationId(1250),
             name: Some("python_integer_inhabit_at_i32_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -37496,15 +37718,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(2015),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1622),
+                                constructor: DeclarationId(1629),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1621),
+                                        constructor: DeclarationId(1628),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1619),
+                                            constructor: DeclarationId(1626),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -37516,7 +37738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1242)),
+                        FieldValue::Reference(DeclarationId(1249)),
                     ),
                 ],
             }),
@@ -37525,22 +37747,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(1244),
+            id: DeclarationId(1251),
             name: Some("python_integer_inhabit_unbounded_decl".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -37553,16 +37775,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(2015),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1623),
+                                constructor: DeclarationId(1630),
                                 payload: vec![],
                             }],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1242)),
+                        FieldValue::Reference(DeclarationId(1249)),
                     ),
                 ],
             }),
@@ -37571,22 +37793,22 @@ 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(1245),
+            id: DeclarationId(1252),
             name: Some("python_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37609,22 +37831,22 @@ 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(1246),
+            id: DeclarationId(1253),
             name: Some("python_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37647,22 +37869,22 @@ 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(1247),
+            id: DeclarationId(1254),
             name: Some("python_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37685,22 +37907,22 @@ 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(1248),
+            id: DeclarationId(1255),
             name: Some("python_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37723,22 +37945,22 @@ 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(1249),
+            id: DeclarationId(1256),
             name: Some("python_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37761,26 +37983,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(1250),
+            id: DeclarationId(1257),
             name: Some("python_declaration_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1105)),
+                        FieldValue::Reference(DeclarationId(1112)),
                     ),
                     (
                         "carrier".to_string(),
@@ -37799,22 +38021,22 @@ 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(1251),
+            id: DeclarationId(1258),
             name: Some("python_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37837,22 +38059,22 @@ 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(1252),
+            id: DeclarationId(1259),
             name: Some("python_dag_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37875,22 +38097,22 @@ 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(1253),
+            id: DeclarationId(1260),
             name: Some("python_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37913,22 +38135,22 @@ 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(1254),
+            id: DeclarationId(1261),
             name: Some("python_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37951,22 +38173,22 @@ 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(1255),
+            id: DeclarationId(1262),
             name: Some("python_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -37989,22 +38211,22 @@ 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(1256),
+            id: DeclarationId(1263),
             name: Some("python_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38027,22 +38249,22 @@ 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(1257),
+            id: DeclarationId(1264),
             name: Some("python_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38065,22 +38287,22 @@ 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(1258),
+            id: DeclarationId(1265),
             name: Some("python_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38103,22 +38325,22 @@ 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(1259),
+            id: DeclarationId(1266),
             name: Some("python_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38141,22 +38363,22 @@ 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(1260),
+            id: DeclarationId(1267),
             name: Some("python_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38179,15 +38401,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(1261),
+            id: DeclarationId(1268),
             name: Some("python_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38200,15 +38422,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(1262),
+            id: DeclarationId(1269),
             name: Some("python_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38221,15 +38443,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(1263),
+            id: DeclarationId(1270),
             name: Some("python_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38242,15 +38464,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(1264),
+            id: DeclarationId(1271),
             name: Some("python_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38263,15 +38485,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(1265),
+            id: DeclarationId(1272),
             name: Some("python_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38284,15 +38506,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(1266),
+            id: DeclarationId(1273),
             name: Some("python_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38305,15 +38527,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(1267),
+            id: DeclarationId(1274),
             name: Some("python_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38326,15 +38548,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(1268),
+            id: DeclarationId(1275),
             name: Some("python_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38347,15 +38569,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(1269),
+            id: DeclarationId(1276),
             name: Some("python_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38368,15 +38590,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(1270),
+            id: DeclarationId(1277),
             name: Some("python_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38389,15 +38611,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(1271),
+            id: DeclarationId(1278),
             name: Some("python_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38410,15 +38632,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(1272),
+            id: DeclarationId(1279),
             name: Some("python_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38431,15 +38653,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(1273),
+            id: DeclarationId(1280),
             name: Some("python_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38452,15 +38674,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(1274),
+            id: DeclarationId(1281),
             name: Some("python_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -38473,22 +38695,22 @@ 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(1275),
+            id: DeclarationId(1282),
             name: Some("python_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38507,22 +38729,22 @@ 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(1276),
+            id: DeclarationId(1283),
             name: Some("python_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38541,22 +38763,22 @@ 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(1277),
+            id: DeclarationId(1284),
             name: Some("python_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38575,22 +38797,22 @@ 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(1278),
+            id: DeclarationId(1285),
             name: Some("python_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38611,22 +38833,22 @@ 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(1279),
+            id: DeclarationId(1286),
             name: Some("python_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38645,22 +38867,22 @@ 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(1280),
+            id: DeclarationId(1287),
             name: Some("python_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38679,22 +38901,22 @@ 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(1281),
+            id: DeclarationId(1288),
             name: Some("python_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38713,22 +38935,22 @@ 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(1282),
+            id: DeclarationId(1289),
             name: Some("python_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38747,22 +38969,22 @@ 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(1283),
+            id: DeclarationId(1290),
             name: Some("python_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38781,22 +39003,22 @@ 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(1284),
+            id: DeclarationId(1291),
             name: Some("python_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38815,22 +39037,22 @@ 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(1285),
+            id: DeclarationId(1292),
             name: Some("python_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38849,22 +39071,22 @@ 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(1286),
+            id: DeclarationId(1293),
             name: Some("python_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38883,22 +39105,22 @@ 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(1287),
+            id: DeclarationId(1294),
             name: Some("python_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38917,22 +39139,22 @@ 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(1288),
+            id: DeclarationId(1295),
             name: Some("python_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38951,22 +39173,22 @@ 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(1289),
+            id: DeclarationId(1296),
             name: Some("python_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -38985,22 +39207,22 @@ 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(1290),
+            id: DeclarationId(1297),
             name: Some("python_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39009,7 +39231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2029),
                             payload: vec![],
                         },
                     ),
@@ -39022,22 +39244,22 @@ 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(1291),
+            id: DeclarationId(1298),
             name: Some("python_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39046,7 +39268,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2030),
                             payload: vec![],
                         },
                     ),
@@ -39057,7 +39279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1997),
+                                    constructor: DeclarationId(2020),
                                     payload: vec![],
                                 },
                             ),
@@ -39071,22 +39293,22 @@ 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(1292),
+            id: DeclarationId(1299),
             name: Some("python_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39095,7 +39317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2008),
+                            constructor: DeclarationId(2031),
                             payload: vec![],
                         },
                     ),
@@ -39107,7 +39329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -39117,7 +39339,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -39132,22 +39354,22 @@ 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(1293),
+            id: DeclarationId(1300),
             name: Some("python_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39156,7 +39378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2009),
+                            constructor: DeclarationId(2032),
                             payload: vec![],
                         },
                     ),
@@ -39168,7 +39390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -39178,7 +39400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -39193,22 +39415,22 @@ 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(1294),
+            id: DeclarationId(1301),
             name: Some("python_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39217,7 +39439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2033),
                             payload: vec![],
                         },
                     ),
@@ -39228,7 +39450,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1996),
+                                    constructor: DeclarationId(2019),
                                     payload: vec![],
                                 },
                             ),
@@ -39242,22 +39464,22 @@ 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(1295),
+            id: DeclarationId(1302),
             name: Some("python_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39266,7 +39488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2034),
                             payload: vec![],
                         },
                     ),
@@ -39277,7 +39499,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1996),
+                                    constructor: DeclarationId(2019),
                                     payload: vec![],
                                 },
                             ),
@@ -39291,22 +39513,22 @@ 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(1296),
+            id: DeclarationId(1303),
             name: Some("python_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39315,7 +39537,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2012),
+                            constructor: DeclarationId(2035),
                             payload: vec![],
                         },
                     ),
@@ -39327,7 +39549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -39337,7 +39559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -39347,7 +39569,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -39362,22 +39584,22 @@ 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(1297),
+            id: DeclarationId(1304),
             name: Some("python_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39386,7 +39608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2013),
+                            constructor: DeclarationId(2036),
                             payload: vec![],
                         },
                     ),
@@ -39398,7 +39620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -39408,7 +39630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -39423,22 +39645,22 @@ 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(1298),
+            id: DeclarationId(1305),
             name: Some("python_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39447,7 +39669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2014),
+                            constructor: DeclarationId(2037),
                             payload: vec![],
                         },
                     ),
@@ -39459,7 +39681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -39469,7 +39691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -39484,22 +39706,22 @@ 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(1299),
+            id: DeclarationId(1306),
             name: Some("python_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39508,7 +39730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2015),
+                            constructor: DeclarationId(2038),
                             payload: vec![],
                         },
                     ),
@@ -39520,7 +39742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -39530,7 +39752,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -39545,22 +39767,22 @@ 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(1300),
+            id: DeclarationId(1307),
             name: Some("python_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39577,24 +39799,24 @@ 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(1301), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1238))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18526, 18764) });
+        declarations.push(Declaration { id: DeclarationId(1308), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(930), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(930)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1245))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18526, 18764) });
         declarations.push(Declaration {
-            id: DeclarationId(1302),
+            id: DeclarationId(1309),
             name: Some("python_non_empty_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39614,22 +39836,22 @@ 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(1303),
+            id: DeclarationId(1310),
             name: Some("python_non_singleton_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39649,22 +39871,22 @@ 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(1304),
+            id: DeclarationId(1311),
             name: Some("python_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "target".to_string(),
@@ -39673,17 +39895,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2017),
+                            constructor: DeclarationId(2040),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1528)),
+                        FieldValue::Reference(DeclarationId(1535)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1530)),
+                        FieldValue::Reference(DeclarationId(1537)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -39713,7 +39935,7 @@ 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(1305),
+            id: DeclarationId(1312),
             name: Some("python_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(841),
@@ -39749,7 +39971,7 @@ 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(1306),
+            id: DeclarationId(1313),
             name: Some("python_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(832),
@@ -39765,55 +39987,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1866),
+                            constructor: DeclarationId(1873),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1871),
+                            constructor: DeclarationId(1878),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1872),
+                            constructor: DeclarationId(1879),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1875),
+                            constructor: DeclarationId(1882),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1879),
+                            constructor: DeclarationId(1886),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1880),
+                            constructor: DeclarationId(1887),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1885),
+                            constructor: DeclarationId(1892),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1305)),
+                        FieldValue::Reference(DeclarationId(1312)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -39842,7 +40064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1887),
+                                    constructor: DeclarationId(1894),
                                     payload: vec![],
                                 },
                             ),
@@ -39855,7 +40077,7 @@ 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(1307),
+            id: DeclarationId(1314),
             name: Some("python_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(833),
@@ -39870,11 +40092,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1238)),
+                        FieldValue::Reference(DeclarationId(1245)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1306)),
+                        FieldValue::Reference(DeclarationId(1313)),
                     ),
                 ],
             }),
@@ -39883,7 +40105,7 @@ 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(1308),
+            id: DeclarationId(1315),
             name: Some("rust_execution_model".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(867),
@@ -39899,14 +40121,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "memory".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1932),
+                            constructor: DeclarationId(1939),
                             payload: vec![],
                         },
                     ),
                     (
                         "scope".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1933),
+                            constructor: DeclarationId(1940),
                             payload: vec![],
                         },
                     ),
@@ -39917,7 +40139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 4798, 4900),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1309),
+            id: DeclarationId(1316),
             name: Some("rust_source_filtering".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(869),
@@ -39947,7 +40169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 4902, 5054),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1310),
+            id: DeclarationId(1317),
             name: Some("rust_execution_requirement".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(871),
@@ -39968,22 +40190,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5056, 5131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1311),
+            id: DeclarationId(1318),
             name: Some("rust_int".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40006,22 +40228,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5582, 5714),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1312),
+            id: DeclarationId(1319),
             name: Some("rust_uint8".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40044,22 +40266,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5716, 5851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1313),
+            id: DeclarationId(1320),
             name: Some("rust_i32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40082,22 +40304,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5853, 5987),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1314),
+            id: DeclarationId(1321),
             name: Some("rust_u32".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40120,22 +40342,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 5989, 6124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1315),
+            id: DeclarationId(1322),
             name: Some("rust_i128".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40158,22 +40380,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 6126, 6263),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1316),
+            id: DeclarationId(1323),
             name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -40186,15 +40408,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(2015),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1622),
+                                constructor: DeclarationId(1629),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(0)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1621),
+                                        constructor: DeclarationId(1628),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1619),
+                                            constructor: DeclarationId(1626),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -40206,7 +40428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1314)),
+                        FieldValue::Reference(DeclarationId(1321)),
                     ),
                 ],
             }),
@@ -40215,22 +40437,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 6684, 6983),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1317),
+            id: DeclarationId(1324),
             name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -40243,15 +40465,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1992),
+                            constructor: DeclarationId(2015),
                             payload: vec![FieldValue::Variant {
-                                constructor: DeclarationId(1622),
+                                constructor: DeclarationId(1629),
                                 payload: vec![
                                     FieldValue::Literal(LiteralBits::Int(-2147483648)),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1621),
+                                        constructor: DeclarationId(1628),
                                         payload: vec![FieldValue::Variant {
-                                            constructor: DeclarationId(1619),
+                                            constructor: DeclarationId(1626),
                                             payload: vec![FieldValue::Literal(LiteralBits::Int(
                                                 4294967295,
                                             ))],
@@ -40263,7 +40485,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1313)),
+                        FieldValue::Reference(DeclarationId(1320)),
                     ),
                 ],
             }),
@@ -40272,22 +40494,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 6985, 7292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1318),
+            id: DeclarationId(1325),
             name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -40300,13 +40522,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1991),
+                            constructor: DeclarationId(2014),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1313)),
+                        FieldValue::Reference(DeclarationId(1320)),
                     ),
                 ],
             }),
@@ -40315,22 +40537,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7294, 7499),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1319),
+            id: DeclarationId(1326),
             name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -40343,13 +40565,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1991),
+                            constructor: DeclarationId(2014),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1311)),
+                        FieldValue::Reference(DeclarationId(1318)),
                     ),
                 ],
             }),
@@ -40358,22 +40580,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7501, 7704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1320),
+            id: DeclarationId(1327),
             name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(909),
+                template: DeclarationId(916),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(909)),
+            meta_tag: Some(DeclarationId(916)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "kernel_integer".to_string(),
@@ -40386,13 +40608,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "bound".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1991),
+                            constructor: DeclarationId(2014),
                             payload: vec![],
                         },
                     ),
                     (
                         "type_realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1315)),
+                        FieldValue::Reference(DeclarationId(1322)),
                     ),
                 ],
             }),
@@ -40401,22 +40623,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7706, 7915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1321),
+            id: DeclarationId(1328),
             name: Some("rust_bool".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40439,22 +40661,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 7917, 8052),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1322),
+            id: DeclarationId(1329),
             name: Some("rust_string".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40477,22 +40699,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8054, 8196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1323),
+            id: DeclarationId(1330),
             name: Some("rust_node_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40515,22 +40737,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8198, 8340),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1324),
+            id: DeclarationId(1331),
             name: Some("rust_port_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40553,22 +40775,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8342, 8484),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1325),
+            id: DeclarationId(1332),
             name: Some("rust_declaration_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40591,22 +40813,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8486, 8649),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1326),
+            id: DeclarationId(1333),
             name: Some("rust_cluster_id".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40629,22 +40851,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8651, 8802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1327),
+            id: DeclarationId(1334),
             name: Some("rust_type_shape".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40668,7 +40890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1993),
+                                    constructor: DeclarationId(2016),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "declaration".to_string(),
                                     ))],
@@ -40688,22 +40910,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 8804, 9049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1328),
+            id: DeclarationId(1335),
             name: Some("rust_port_state".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40726,22 +40948,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 9051, 9203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1329),
+            id: DeclarationId(1336),
             name: Some("rust_port".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40766,7 +40988,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -40785,7 +41007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "state_value".to_string(),
                                         ))],
@@ -40806,7 +41028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "produced_by".to_string(),
                                         ))],
@@ -40827,22 +41049,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 9205, 9601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1330),
+            id: DeclarationId(1337),
             name: Some("rust_source_span".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40867,7 +41089,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "file".to_string(),
                                         ))],
@@ -40886,7 +41108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_start".to_string(),
                                         ))],
@@ -40905,7 +41127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "byte_end".to_string(),
                                         ))],
@@ -40926,22 +41148,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 9603, 10001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1331),
+            id: DeclarationId(1338),
             name: Some("rust_literal_bits".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -40964,22 +41186,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10003, 10161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1332),
+            id: DeclarationId(1339),
             name: Some("rust_atom_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41002,22 +41224,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10163, 10321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1333),
+            id: DeclarationId(1340),
             name: Some("rust_cardinality_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41040,22 +41262,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10323, 10496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1334),
+            id: DeclarationId(1341),
             name: Some("rust_interval".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41078,22 +41300,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10498, 10646),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1335),
+            id: DeclarationId(1342),
             name: Some("rust_positive_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41118,22 +41340,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10648, 10837),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1336),
+            id: DeclarationId(1343),
             name: Some("rust_interval_width".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41156,22 +41378,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 10839, 11003),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1337),
+            id: DeclarationId(1344),
             name: Some("rust_conj_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41196,7 +41418,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "label".to_string(),
                                         ))],
@@ -41215,7 +41437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ty".to_string(),
                                         ))],
@@ -41236,22 +41458,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11005, 11307),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1338),
+            id: DeclarationId(1345),
             name: Some("rust_template_argument".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41278,7 +41500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -41297,7 +41519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value".to_string(),
                                         ))],
@@ -41318,22 +41540,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11309, 11650),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1339),
+            id: DeclarationId(1346),
             name: Some("rust_phantom_parameter".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41360,7 +41582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "parameter".to_string(),
                                         ))],
@@ -41379,7 +41601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "algebra".to_string(),
                                         ))],
@@ -41400,22 +41622,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11652, 11997),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1340),
+            id: DeclarationId(1347),
             name: Some("rust_nominal_opacity".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41441,7 +41663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1993),
+                                    constructor: DeclarationId(2016),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "permitted_accessors".to_string(),
                                     ))],
@@ -41461,22 +41683,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 11999, 12275),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1341),
+            id: DeclarationId(1348),
             name: Some("rust_field_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41503,7 +41725,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "0".to_string(),
                                         ))],
@@ -41522,7 +41744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "1".to_string(),
                                         ))],
@@ -41543,22 +41765,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 12277, 12594),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1342),
+            id: DeclarationId(1349),
             name: Some("rust_non_empty_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41583,7 +41805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -41602,7 +41824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -41623,22 +41845,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 12596, 12916),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1343),
+            id: DeclarationId(1350),
             name: Some("rust_non_singleton_list".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41663,7 +41885,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "first".to_string(),
                                         ))],
@@ -41682,7 +41904,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "second".to_string(),
                                         ))],
@@ -41701,7 +41923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "rest".to_string(),
                                         ))],
@@ -41722,22 +41944,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 12918, 13331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1344),
+            id: DeclarationId(1351),
             name: Some("rust_element_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41761,7 +41983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1994),
+                                    constructor: DeclarationId(2017),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "index_of".to_string(),
                                     ))],
@@ -41781,22 +42003,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13333, 13574),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1345),
+            id: DeclarationId(1352),
             name: Some("rust_param_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41821,7 +42043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "member_of".to_string(),
                                         ))],
@@ -41840,7 +42062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "slot_of".to_string(),
                                         ))],
@@ -41861,22 +42083,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13576, 13896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1346),
+            id: DeclarationId(1353),
             name: Some("rust_transform_ref".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41900,7 +42122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1994),
+                                    constructor: DeclarationId(2017),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "node_id".to_string(),
                                     ))],
@@ -41920,22 +42142,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 13898, 14143),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1347),
+            id: DeclarationId(1354),
             name: Some("rust_member_descent".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -41959,7 +42181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1993),
+                                    constructor: DeclarationId(2016),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "param".to_string(),
                                     ))],
@@ -41979,22 +42201,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14145, 14390),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1348),
+            id: DeclarationId(1355),
             name: Some("rust_intra_cluster_call".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42018,7 +42240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "access".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1993),
+                                    constructor: DeclarationId(2016),
                                     payload: vec![FieldValue::Literal(LiteralBits::String(
                                         "transform".to_string(),
                                     ))],
@@ -42038,22 +42260,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14392, 14655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1349),
+            id: DeclarationId(1356),
             name: Some("rust_cluster".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42078,7 +42300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "members".to_string(),
                                         ))],
@@ -42099,7 +42321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "intra_cluster_calls".to_string(),
                                         ))],
@@ -42120,22 +42342,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14657, 14994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1350),
+            id: DeclarationId(1357),
             name: Some("rust_field_value".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42158,22 +42380,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 14996, 15151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1351),
+            id: DeclarationId(1358),
             name: Some("rust_value_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42196,22 +42418,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 15153, 15305),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1352),
+            id: DeclarationId(1359),
             name: Some("rust_arrow_body".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42234,22 +42456,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 15307, 15459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1353),
+            id: DeclarationId(1360),
             name: Some("rust_type_connective".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42272,22 +42494,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 15461, 15628),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1354),
+            id: DeclarationId(1361),
             name: Some("rust_declaration".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42312,7 +42534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -42331,7 +42553,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -42352,7 +42574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "connective".to_string(),
                                         ))],
@@ -42373,7 +42595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "type_params".to_string(),
                                         ))],
@@ -42394,7 +42616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "phantom_params".to_string(),
                                         ))],
@@ -42415,7 +42637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "meta_tag".to_string(),
                                         ))],
@@ -42436,7 +42658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inhabits".to_string(),
                                         ))],
@@ -42457,7 +42679,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "value_body".to_string(),
                                         ))],
@@ -42478,7 +42700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nominal_opacity".to_string(),
                                         ))],
@@ -42497,7 +42719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -42518,22 +42740,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 15630, 16651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1355),
+            id: DeclarationId(1362),
             name: Some("rust_arithmetic_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42556,22 +42778,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16653, 16814),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1356),
+            id: DeclarationId(1363),
             name: Some("rust_comparison_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42594,22 +42816,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16816, 16977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1357),
+            id: DeclarationId(1364),
             name: Some("rust_logical_op".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42632,22 +42854,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 16979, 17131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1358),
+            id: DeclarationId(1365),
             name: Some("rust_operator_kind".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42670,22 +42892,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17133, 17294),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1359),
+            id: DeclarationId(1366),
             name: Some("rust_transform_target".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42708,22 +42930,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17296, 17466),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1360),
+            id: DeclarationId(1367),
             name: Some("rust_branch_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42746,22 +42968,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17468, 17632),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1361),
+            id: DeclarationId(1368),
             name: Some("rust_payload_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42788,7 +43010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding_name".to_string(),
                                         ))],
@@ -42809,7 +43031,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "payload_port".to_string(),
                                         ))],
@@ -42830,22 +43052,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17634, 17989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1362),
+            id: DeclarationId(1369),
             name: Some("rust_branch_path".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42870,7 +43092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -42891,7 +43113,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -42910,7 +43132,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "pattern".to_string(),
                                         ))],
@@ -42929,7 +43151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "binding".to_string(),
                                         ))],
@@ -42950,22 +43172,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 17991, 18479),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1363),
+            id: DeclarationId(1370),
             name: Some("rust_loop_bound".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -42988,22 +43210,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 18481, 18633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1364),
+            id: DeclarationId(1371),
             name: Some("rust_value_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -43028,7 +43250,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43047,7 +43269,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "data".to_string(),
                                         ))],
@@ -43068,7 +43290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43087,7 +43309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43108,7 +43330,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -43129,22 +43351,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 18635, 19408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1365),
+            id: DeclarationId(1372),
             name: Some("rust_transform_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -43169,7 +43391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43188,7 +43410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "target".to_string(),
                                         ))],
@@ -43207,7 +43429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "inputs".to_string(),
                                         ))],
@@ -43228,7 +43450,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43247,7 +43469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43268,22 +43490,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 19410, 19982),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1366),
+            id: DeclarationId(1373),
             name: Some("rust_branch_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -43308,7 +43530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43327,7 +43549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "input".to_string(),
                                         ))],
@@ -43346,7 +43568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "paths".to_string(),
                                         ))],
@@ -43367,7 +43589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43386,7 +43608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43407,7 +43629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -43428,22 +43650,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 19984, 20651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1367),
+            id: DeclarationId(1374),
             name: Some("rust_loop_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -43468,7 +43690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43487,7 +43709,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "source".to_string(),
                                         ))],
@@ -43506,7 +43728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "init".to_string(),
                                         ))],
@@ -43525,7 +43747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "body".to_string(),
                                         ))],
@@ -43544,7 +43766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "bound".to_string(),
                                         ))],
@@ -43565,7 +43787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43584,7 +43806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43605,22 +43827,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 20653, 21362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1368),
+            id: DeclarationId(1375),
             name: Some("rust_bind_node".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -43645,7 +43867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "id".to_string(),
                                         ))],
@@ -43664,7 +43886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "name".to_string(),
                                         ))],
@@ -43685,7 +43907,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "result_port".to_string(),
                                         ))],
@@ -43704,7 +43926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "params".to_string(),
                                         ))],
@@ -43723,7 +43945,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1993),
+                                        constructor: DeclarationId(2016),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "span".to_string(),
                                         ))],
@@ -43744,7 +43966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "lane2_workflow".to_string(),
                                         ))],
@@ -43765,7 +43987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "emit_participation".to_string(),
                                         ))],
@@ -43786,22 +44008,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 21364, 22124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1369),
+            id: DeclarationId(1376),
             name: Some("rust_behavior".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -43824,22 +44046,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 22126, 22274),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1370),
+            id: DeclarationId(1377),
             name: Some("rust_dag".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -43866,7 +44088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "declarations".to_string(),
                                         ))],
@@ -43885,7 +44107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "nodes".to_string(),
                                         ))],
@@ -43904,7 +44126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "ports".to_string(),
                                         ))],
@@ -43925,7 +44147,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "access".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1994),
+                                        constructor: DeclarationId(2017),
                                         payload: vec![FieldValue::Literal(LiteralBits::String(
                                             "clusters".to_string(),
                                         ))],
@@ -43946,15 +44168,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 22276, 22756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1371),
+            id: DeclarationId(1378),
             name: Some("rust_surface_module".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -43967,15 +44189,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 22969, 23229),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1372),
+            id: DeclarationId(1379),
             name: Some("rust_surface_item".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -43988,15 +44210,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 23231, 23404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1373),
+            id: DeclarationId(1380),
             name: Some("rust_surface_param".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44009,15 +44231,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 23406, 23823),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1374),
+            id: DeclarationId(1381),
             name: Some("rust_surface_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44030,15 +44252,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 23825, 24153),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1375),
+            id: DeclarationId(1382),
             name: Some("rust_surface_variant".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44051,15 +44273,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 24155, 24576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1376),
+            id: DeclarationId(1383),
             name: Some("rust_variant_payload".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44072,15 +44294,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 24578, 24760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1377),
+            id: DeclarationId(1384),
             name: Some("rust_surface_type".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44093,15 +44315,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 24762, 24935),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1378),
+            id: DeclarationId(1385),
             name: Some("rust_surface_record_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44114,15 +44336,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 24937, 25367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1379),
+            id: DeclarationId(1386),
             name: Some("rust_surface_map_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44135,15 +44357,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 25369, 25873),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1380),
+            id: DeclarationId(1387),
             name: Some("rust_surface_match_arm".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44156,15 +44378,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 25875, 26300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1381),
+            id: DeclarationId(1388),
             name: Some("rust_surface_pattern_field".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44177,15 +44399,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 26302, 26739),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1382),
+            id: DeclarationId(1389),
             name: Some("rust_surface_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44198,15 +44420,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 26741, 26923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1383),
+            id: DeclarationId(1390),
             name: Some("rust_surface_literal".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44219,15 +44441,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 26925, 27107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1384),
+            id: DeclarationId(1391),
             name: Some("rust_surface_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Unparsed(SourceSpan::new(
@@ -44240,22 +44462,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 27109, 27282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1385),
+            id: DeclarationId(1392),
             name: Some("rust_int_add".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44274,22 +44496,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 28137, 28282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1386),
+            id: DeclarationId(1393),
             name: Some("rust_int_sub".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44308,22 +44530,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 28284, 28429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1387),
+            id: DeclarationId(1394),
             name: Some("rust_int_mul".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44342,22 +44564,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 28431, 28576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1388),
+            id: DeclarationId(1395),
             name: Some("rust_int_div".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44378,22 +44600,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 28578, 28736),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1389),
+            id: DeclarationId(1396),
             name: Some("rust_int_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44412,22 +44634,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29186, 29330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1390),
+            id: DeclarationId(1397),
             name: Some("rust_node_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44446,22 +44668,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29332, 29483),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1391),
+            id: DeclarationId(1398),
             name: Some("rust_port_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44480,22 +44702,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29485, 29636),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1392),
+            id: DeclarationId(1399),
             name: Some("rust_declaration_id_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44514,22 +44736,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29638, 29803),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1393),
+            id: DeclarationId(1400),
             name: Some("rust_string_eq".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44548,22 +44770,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 29996, 30146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1394),
+            id: DeclarationId(1401),
             name: Some("rust_int_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44582,22 +44804,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30148, 30292),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1395),
+            id: DeclarationId(1402),
             name: Some("rust_node_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44616,22 +44838,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30294, 30445),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1396),
+            id: DeclarationId(1403),
             name: Some("rust_port_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44650,22 +44872,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30447, 30598),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1397),
+            id: DeclarationId(1404),
             name: Some("rust_declaration_id_ne".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44684,22 +44906,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30600, 30765),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1398),
+            id: DeclarationId(1405),
             name: Some("rust_int_lt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44718,22 +44940,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30767, 30910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1399),
+            id: DeclarationId(1406),
             name: Some("rust_int_le".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44752,22 +44974,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 30912, 31056),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1400),
+            id: DeclarationId(1407),
             name: Some("rust_int_gt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44786,22 +45008,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 31058, 31201),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1401),
+            id: DeclarationId(1408),
             name: Some("rust_int_ge".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44820,22 +45042,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 31203, 31347),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1402),
+            id: DeclarationId(1409),
             name: Some("rust_bool_meet".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44854,22 +45076,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 31349, 31502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1403),
+            id: DeclarationId(1410),
             name: Some("rust_bool_join".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(913),
+                template: DeclarationId(920),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(913)),
+            meta_tag: Some(DeclarationId(920)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -44888,26 +45110,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 31504, 31657),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1404),
+            id: DeclarationId(1411),
             name: Some("rust_let_stmt".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1103)),
+                        FieldValue::Reference(DeclarationId(1110)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44923,26 +45145,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32407, 32546),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1405),
+            id: DeclarationId(1412),
             name: Some("rust_if_expr".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1101)),
+                        FieldValue::Reference(DeclarationId(1108)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44958,26 +45180,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32548, 32695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1406),
+            id: DeclarationId(1413),
             name: Some("rust_main_wrap".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(914),
+                template: DeclarationId(921),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(914)),
+            meta_tag: Some(DeclarationId(921)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1104)),
+                        FieldValue::Reference(DeclarationId(1111)),
                     ),
                     (
                         "carrier".to_string(),
@@ -44994,22 +45216,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 32697, 32867),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1407),
+            id: DeclarationId(1414),
             name: Some("rust_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45018,7 +45240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2006),
+                            constructor: DeclarationId(2029),
                             payload: vec![],
                         },
                     ),
@@ -45031,22 +45253,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34244, 34386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1408),
+            id: DeclarationId(1415),
             name: Some("rust_singleton_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45055,7 +45277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2007),
+                            constructor: DeclarationId(2030),
                             payload: vec![],
                         },
                     ),
@@ -45066,7 +45288,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1997),
+                                    constructor: DeclarationId(2020),
                                     payload: vec![],
                                 },
                             ),
@@ -45080,22 +45302,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34388, 34584),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1409),
+            id: DeclarationId(1416),
             name: Some("rust_cons_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45104,7 +45326,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2008),
+                            constructor: DeclarationId(2031),
                             payload: vec![],
                         },
                     ),
@@ -45116,7 +45338,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -45126,7 +45348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -45141,22 +45363,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34586, 34807),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1410),
+            id: DeclarationId(1417),
             name: Some("rust_concat_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45165,7 +45387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2009),
+                            constructor: DeclarationId(2032),
                             payload: vec![],
                         },
                     ),
@@ -45177,7 +45399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -45187,7 +45409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -45202,22 +45424,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 34809, 35036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1411),
+            id: DeclarationId(1418),
             name: Some("rust_length_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45226,7 +45448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2010),
+                            constructor: DeclarationId(2033),
                             payload: vec![],
                         },
                     ),
@@ -45237,7 +45459,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1996),
+                                    constructor: DeclarationId(2019),
                                     payload: vec![],
                                 },
                             ),
@@ -45251,22 +45473,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35038, 35225),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1412),
+            id: DeclarationId(1419),
             name: Some("rust_list_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45284,22 +45506,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35227, 35370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1413),
+            id: DeclarationId(1420),
             name: Some("rust_result_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45319,26 +45541,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35649, 35820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1414),
+            id: DeclarationId(1421),
             name: Some("rust_lookup_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
-                        FieldValue::Reference(DeclarationId(1017)),
+                        FieldValue::Reference(DeclarationId(1024)),
                     ),
                     (
                         "carrier".to_string(),
@@ -45352,22 +45574,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35822, 35972),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1415),
+            id: DeclarationId(1422),
             name: Some("rust_map_instantiation".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(923),
+                template: DeclarationId(930),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(923)),
+            meta_tag: Some(DeclarationId(930)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45387,22 +45609,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 35974, 36124),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1416),
+            id: DeclarationId(1423),
             name: Some("rust_is_empty_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45411,7 +45633,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2011),
+                            constructor: DeclarationId(2034),
                             payload: vec![],
                         },
                     ),
@@ -45422,7 +45644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "disposition".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1996),
+                                    constructor: DeclarationId(2019),
                                     payload: vec![],
                                 },
                             ),
@@ -45436,22 +45658,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 36126, 36318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1417),
+            id: DeclarationId(1424),
             name: Some("rust_fold_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45460,7 +45682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2012),
+                            constructor: DeclarationId(2035),
                             payload: vec![],
                         },
                     ),
@@ -45472,7 +45694,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -45482,7 +45704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1997),
+                                        constructor: DeclarationId(2020),
                                         payload: vec![],
                                     },
                                 ),
@@ -45492,7 +45714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -45507,22 +45729,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 36320, 36581),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1418),
+            id: DeclarationId(1425),
             name: Some("rust_map_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45531,7 +45753,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2013),
+                            constructor: DeclarationId(2036),
                             payload: vec![],
                         },
                     ),
@@ -45543,7 +45765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -45553,7 +45775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -45568,22 +45790,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 36583, 36801),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1419),
+            id: DeclarationId(1426),
             name: Some("rust_filter_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45592,7 +45814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2014),
+                            constructor: DeclarationId(2037),
                             payload: vec![],
                         },
                     ),
@@ -45604,7 +45826,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -45614,7 +45836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -45629,22 +45851,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 36803, 37030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1420),
+            id: DeclarationId(1427),
             name: Some("rust_contains_callable".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(915),
+                template: DeclarationId(922),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(915)),
+            meta_tag: Some(DeclarationId(922)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45653,7 +45875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2015),
+                            constructor: DeclarationId(2038),
                             payload: vec![],
                         },
                     ),
@@ -45665,7 +45887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -45675,7 +45897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                                 (
                                     "disposition".to_string(),
                                     FieldValue::Variant {
-                                        constructor: DeclarationId(1996),
+                                        constructor: DeclarationId(2019),
                                         payload: vec![],
                                     },
                                 ),
@@ -45690,22 +45912,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37032, 37265),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1421),
+            id: DeclarationId(1428),
             name: Some("rust_list_pattern".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(925),
+                template: DeclarationId(932),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(925)),
+            meta_tag: Some(DeclarationId(932)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -45714,17 +45936,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "strategy".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2017),
+                            constructor: DeclarationId(2040),
                             payload: vec![],
                         },
                     ),
                     (
                         "empty_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1528)),
+                        FieldValue::Reference(DeclarationId(1535)),
                     ),
                     (
                         "cons_variant".to_string(),
-                        FieldValue::Reference(DeclarationId(1530)),
+                        FieldValue::Reference(DeclarationId(1537)),
                     ),
                     (
                         "scrutinee".to_string(),
@@ -45756,15 +45978,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37493, 37797),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1422),
+            id: DeclarationId(1429),
             name: Some("rust_statements".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(927),
+                template: DeclarationId(934),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(927)),
+            meta_tag: Some(DeclarationId(934)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45788,15 +46010,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37799, 37937),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1423),
+            id: DeclarationId(1430),
             name: Some("rust_expressions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(928),
+                template: DeclarationId(935),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(928)),
+            meta_tag: Some(DeclarationId(935)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45822,15 +46044,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 37939, 38092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1424),
+            id: DeclarationId(1431),
             name: Some("rust_control_flow".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(930),
+                template: DeclarationId(937),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(930)),
+            meta_tag: Some(DeclarationId(937)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45867,15 +46089,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38094, 38284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1425),
+            id: DeclarationId(1432),
             name: Some("rust_literals".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(931),
+                template: DeclarationId(938),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(931)),
+            meta_tag: Some(DeclarationId(938)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45899,15 +46121,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38286, 38398),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1426),
+            id: DeclarationId(1433),
             name: Some("rust_modules".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(932),
+                template: DeclarationId(939),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(932)),
+            meta_tag: Some(DeclarationId(939)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45921,15 +46143,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38400, 38460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1427),
+            id: DeclarationId(1434),
             name: Some("rust_functions".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(933),
+                template: DeclarationId(940),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(933)),
+            meta_tag: Some(DeclarationId(940)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45967,15 +46189,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38462, 38740),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1428),
+            id: DeclarationId(1435),
             name: Some("rust_type_applications".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(934),
+                template: DeclarationId(941),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(934)),
+            meta_tag: Some(DeclarationId(941)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -45989,15 +46211,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38742, 38830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1429),
+            id: DeclarationId(1436),
             name: Some("rust_type_defs".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(935),
+                template: DeclarationId(942),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(935)),
+            meta_tag: Some(DeclarationId(942)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46035,15 +46257,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 38832, 39134),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1430),
+            id: DeclarationId(1437),
             name: Some("rust_record_derive_templates".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(936),
+                template: DeclarationId(943),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(936)),
+            meta_tag: Some(DeclarationId(943)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46067,15 +46289,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 39136, 39349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1431),
+            id: DeclarationId(1438),
             name: Some("rust_patterns".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(937),
+                template: DeclarationId(944),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(937)),
+            meta_tag: Some(DeclarationId(944)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46125,15 +46347,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 39351, 39686),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1432),
+            id: DeclarationId(1439),
             name: Some("rust_language_spec_free_monoid_concat_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46155,7 +46377,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "{ let mut __left = {left}; __left.extend({right}); __left }"
                                     .to_string(),
@@ -46169,7 +46391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -46180,15 +46402,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 39688, 40058),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1433),
+            id: DeclarationId(1440),
             name: Some("rust_language_spec_free_monoid_length_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46209,7 +46431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).len() as i64".to_string(),
                             ))],
@@ -46222,7 +46444,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -46233,15 +46455,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 40060, 40354),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1434),
+            id: DeclarationId(1441),
             name: Some("rust_language_spec_free_monoid_emptiness_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46260,7 +46482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).is_empty()".to_string(),
                             ))],
@@ -46273,7 +46495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -46284,15 +46506,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 40525, 40820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1435),
+            id: DeclarationId(1442),
             name: Some("rust_language_spec_free_monoid_fold_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46313,7 +46535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().fold({init}, {body})".to_string(),
                             ))],
@@ -46326,7 +46548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -46337,15 +46559,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 40822, 41142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1436),
+            id: DeclarationId(1443),
             name: Some("rust_language_spec_map_contract".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(946),
+                template: DeclarationId(953),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(946)),
+            meta_tag: Some(DeclarationId(953)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46366,7 +46588,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "emit_template".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2024),
+                            constructor: DeclarationId(2047),
                             payload: vec![FieldValue::Literal(LiteralBits::String(
                                 "({recv}).iter().map({body}).collect::<Vec<_>>()".to_string(),
                             ))],
@@ -46379,7 +46601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "placeholder_convention".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2023),
+                            constructor: DeclarationId(2046),
                             payload: vec![],
                         },
                     ),
@@ -46389,17 +46611,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             nominal_opacity: None,
             span: SourceSpan::new("src/v3/spec/rust.dag", 41144, 41472),
         });
-        declarations.push(Declaration { id: DeclarationId(1437), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(938), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(938)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1432))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1433))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1434))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1435))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1043))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1046))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1044))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1045))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1436))), ("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", 41474, 42350) });
+        declarations.push(Declaration { id: DeclarationId(1444), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(945), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(945)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1439))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1440))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1441))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1442))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1050))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1053))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1051))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1052))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1443))), ("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", 41474, 42350) });
         declarations.push(Declaration {
-            id: DeclarationId(1438),
+            id: DeclarationId(1445),
             name: Some("rust_value_construction".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(939),
+                template: DeclarationId(946),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(939)),
+            meta_tag: Some(DeclarationId(946)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46435,15 +46657,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42352, 42624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1439),
+            id: DeclarationId(1446),
             name: Some("rust_rendering".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(940),
+                template: DeclarationId(947),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(940)),
+            meta_tag: Some(DeclarationId(947)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -46451,14 +46673,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "read".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2018),
+                            constructor: DeclarationId(2041),
                             payload: vec![],
                         },
                     ),
                     (
                         "construct".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2020),
+                            constructor: DeclarationId(2043),
                             payload: vec![],
                         },
                     ),
@@ -46469,66 +46691,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42626, 42707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1440),
+            id: DeclarationId(1447),
             name: Some("rust_language".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(943),
+                template: DeclarationId(950),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(943)),
+            meta_tag: Some(DeclarationId(950)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "statements".to_string(),
-                        FieldValue::Reference(DeclarationId(1422)),
+                        FieldValue::Reference(DeclarationId(1429)),
                     ),
                     (
                         "expressions".to_string(),
-                        FieldValue::Reference(DeclarationId(1423)),
+                        FieldValue::Reference(DeclarationId(1430)),
                     ),
                     (
                         "control_flow".to_string(),
-                        FieldValue::Reference(DeclarationId(1424)),
+                        FieldValue::Reference(DeclarationId(1431)),
                     ),
                     (
                         "literals".to_string(),
-                        FieldValue::Reference(DeclarationId(1425)),
+                        FieldValue::Reference(DeclarationId(1432)),
                     ),
                     (
                         "modules".to_string(),
-                        FieldValue::Reference(DeclarationId(1426)),
+                        FieldValue::Reference(DeclarationId(1433)),
                     ),
                     (
                         "functions".to_string(),
-                        FieldValue::Reference(DeclarationId(1427)),
+                        FieldValue::Reference(DeclarationId(1434)),
                     ),
                     (
                         "type_applications".to_string(),
-                        FieldValue::Reference(DeclarationId(1428)),
+                        FieldValue::Reference(DeclarationId(1435)),
                     ),
                     (
                         "type_definitions".to_string(),
-                        FieldValue::Reference(DeclarationId(1429)),
+                        FieldValue::Reference(DeclarationId(1436)),
                     ),
                     (
                         "record_derive_templates".to_string(),
-                        FieldValue::Reference(DeclarationId(1430)),
+                        FieldValue::Reference(DeclarationId(1437)),
                     ),
                     (
                         "patterns".to_string(),
-                        FieldValue::Reference(DeclarationId(1431)),
+                        FieldValue::Reference(DeclarationId(1438)),
                     ),
                     (
                         "collection_ops".to_string(),
-                        FieldValue::Reference(DeclarationId(1437)),
+                        FieldValue::Reference(DeclarationId(1444)),
                     ),
                     (
                         "values".to_string(),
-                        FieldValue::Reference(DeclarationId(1438)),
+                        FieldValue::Reference(DeclarationId(1445)),
                     ),
                 ],
             }),
@@ -46537,7 +46759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 42709, 43154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1441),
+            id: DeclarationId(1448),
             name: Some("rust_correction_style".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(841),
@@ -46573,7 +46795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 44578, 44717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1442),
+            id: DeclarationId(1449),
             name: Some("rust_clean_emission".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(832),
@@ -46589,55 +46811,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     (
                         "expression_wrapping".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1866),
+                            constructor: DeclarationId(1873),
                             payload: vec![],
                         },
                     ),
                     (
                         "pattern_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1869),
+                            constructor: DeclarationId(1876),
                             payload: vec![],
                         },
                     ),
                     (
                         "variant_payload_field_access".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1873),
+                            constructor: DeclarationId(1880),
                             payload: vec![],
                         },
                     ),
                     (
                         "imports".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1875),
+                            constructor: DeclarationId(1882),
                             payload: vec![],
                         },
                     ),
                     (
                         "block_return".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1878),
+                            constructor: DeclarationId(1885),
                             payload: vec![],
                         },
                     ),
                     (
                         "variable_bindings".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1881),
+                            constructor: DeclarationId(1888),
                             payload: vec![],
                         },
                     ),
                     (
                         "match_arm_body".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(1884),
+                            constructor: DeclarationId(1891),
                             payload: vec![],
                         },
                     ),
                     (
                         "correction_style".to_string(),
-                        FieldValue::Reference(DeclarationId(1441)),
+                        FieldValue::Reference(DeclarationId(1448)),
                     ),
                     (
                         "post_emit_verifier".to_string(),
@@ -46669,7 +46891,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                             (
                                 "output_policy".to_string(),
                                 FieldValue::Variant {
-                                    constructor: DeclarationId(1887),
+                                    constructor: DeclarationId(1894),
                                     payload: vec![],
                                 },
                             ),
@@ -46682,7 +46904,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 44719, 45332),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1443),
+            id: DeclarationId(1450),
             name: Some("rust_clean_emission_binding".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(833),
@@ -46697,11 +46919,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "clean_emission".to_string(),
-                        FieldValue::Reference(DeclarationId(1442)),
+                        FieldValue::Reference(DeclarationId(1449)),
                     ),
                 ],
             }),
@@ -46710,7 +46932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 45334, 45464),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1444),
+            id: DeclarationId(1451),
             name: Some("rust_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -46734,7 +46956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 46566, 46669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1445),
+            id: DeclarationId(1452),
             name: Some("rust_node_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -46758,7 +46980,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 46671, 46774),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1446),
+            id: DeclarationId(1453),
             name: Some("rust_resolve_producer_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -46782,7 +47004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 46776, 46903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1447),
+            id: DeclarationId(1454),
             name: Some("port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -46801,11 +47023,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1444)),
+                        FieldValue::Reference(DeclarationId(1451)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                 ],
             }),
@@ -46814,7 +47036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 46905, 47036),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1448),
+            id: DeclarationId(1455),
             name: Some("node_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -46833,11 +47055,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1445)),
+                        FieldValue::Reference(DeclarationId(1452)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                 ],
             }),
@@ -46846,7 +47068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 47038, 47169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1449),
+            id: DeclarationId(1456),
             name: Some("resolve_producer_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -46865,11 +47087,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1446)),
+                        FieldValue::Reference(DeclarationId(1453)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                 ],
             }),
@@ -46878,7 +47100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 47171, 47338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1450),
+            id: DeclarationId(1457),
             name: Some("rust_lane2_workflow_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -46902,7 +47124,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 47849, 47978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1451),
+            id: DeclarationId(1458),
             name: Some("lane2_workflow_at_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -46921,11 +47143,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1450)),
+                        FieldValue::Reference(DeclarationId(1457)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                 ],
             }),
@@ -46934,7 +47156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 47980, 48147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1452),
+            id: DeclarationId(1459),
             name: Some("rust_workflow_root_port_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -46958,7 +47180,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 48842, 48956),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1453),
+            id: DeclarationId(1460),
             name: Some("workflow_root_port_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -46977,11 +47199,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1452)),
+                        FieldValue::Reference(DeclarationId(1459)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                 ],
             }),
@@ -46990,22 +47212,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 48958, 49131),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1454),
+            id: DeclarationId(1461),
             name: Some("rust_workflow_root".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(908),
+                template: DeclarationId(915),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(908)),
+            meta_tag: Some(DeclarationId(915)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                     (
                         "target".to_string(),
@@ -47028,7 +47250,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 49543, 49704),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1455),
+            id: DeclarationId(1462),
             name: Some("rust_declaration_by_id_accessor".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(748),
@@ -47052,7 +47274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 50031, 50154),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1456),
+            id: DeclarationId(1463),
             name: Some("declaration_by_id_binding_rust".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(749),
@@ -47071,11 +47293,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1455)),
+                        FieldValue::Reference(DeclarationId(1462)),
                     ),
                     (
                         "language".to_string(),
-                        FieldValue::Reference(DeclarationId(1440)),
+                        FieldValue::Reference(DeclarationId(1447)),
                     ),
                 ],
             }),
@@ -47084,7 +47306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/spec/rust.dag", 50156, 50326),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1457),
+            id: DeclarationId(1464),
             name: Some("CompilerHostRealization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47103,21 +47325,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(1458),
+            id: DeclarationId(1465),
             name: Some("PipelineSnapshotKind".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "SnapshotSurface".to_string(),
-                        ty: DeclarationId(2252),
+                        ty: DeclarationId(2275),
                     },
                     Field {
                         label: "SnapshotDag".to_string(),
-                        ty: DeclarationId(2253),
+                        ty: DeclarationId(2276),
                     },
                     Field {
                         label: "SnapshotText".to_string(),
-                        ty: DeclarationId(2254),
+                        ty: DeclarationId(2277),
                     },
                 ],
             },
@@ -47132,21 +47354,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(1459),
+            id: DeclarationId(1466),
             name: Some("PipelineStageBinding".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "stage".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "realization".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "snapshot".to_string(),
-                        ty: DeclarationId(1458),
+                        ty: DeclarationId(1465),
                     },
                 ],
             },
@@ -47161,7 +47383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1460),
+            id: DeclarationId(1467),
             name: Some("parse_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47171,7 +47393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1457)),
+            meta_tag: Some(DeclarationId(1464)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47185,7 +47407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1461),
+            id: DeclarationId(1468),
             name: Some("lower_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47195,7 +47417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1457)),
+            meta_tag: Some(DeclarationId(1464)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47209,7 +47431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1462),
+            id: DeclarationId(1469),
             name: Some("infer_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47219,7 +47441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1457)),
+            meta_tag: Some(DeclarationId(1464)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47233,7 +47455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1463),
+            id: DeclarationId(1470),
             name: Some("compute_ownership_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47243,7 +47465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1457)),
+            meta_tag: Some(DeclarationId(1464)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47259,7 +47481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1464),
+            id: DeclarationId(1471),
             name: Some("emit_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47269,7 +47491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1457)),
+            meta_tag: Some(DeclarationId(1464)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47283,7 +47505,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1465),
+            id: DeclarationId(1472),
             name: Some("lens_complexity_realization".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -47293,7 +47515,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1457)),
+            meta_tag: Some(DeclarationId(1464)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47309,31 +47531,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(1466),
+            id: DeclarationId(1473),
             name: Some("parse_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1459),
+                template: DeclarationId(1466),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1459)),
+            meta_tag: Some(DeclarationId(1466)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1472)),
+                        FieldValue::Reference(DeclarationId(1479)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1460)),
+                        FieldValue::Reference(DeclarationId(1467)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2252),
+                            constructor: DeclarationId(2275),
                             payload: vec![],
                         },
                     ),
@@ -47344,31 +47566,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(1467),
+            id: DeclarationId(1474),
             name: Some("lower_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1459),
+                template: DeclarationId(1466),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1459)),
+            meta_tag: Some(DeclarationId(1466)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1473)),
+                        FieldValue::Reference(DeclarationId(1480)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1461)),
+                        FieldValue::Reference(DeclarationId(1468)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2276),
                             payload: vec![],
                         },
                     ),
@@ -47379,31 +47601,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(1468),
+            id: DeclarationId(1475),
             name: Some("infer_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1459),
+                template: DeclarationId(1466),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1459)),
+            meta_tag: Some(DeclarationId(1466)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1474)),
+                        FieldValue::Reference(DeclarationId(1481)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1462)),
+                        FieldValue::Reference(DeclarationId(1469)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2276),
                             payload: vec![],
                         },
                     ),
@@ -47414,31 +47636,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(1469),
+            id: DeclarationId(1476),
             name: Some("compute_ownership_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1459),
+                template: DeclarationId(1466),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1459)),
+            meta_tag: Some(DeclarationId(1466)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1475)),
+                        FieldValue::Reference(DeclarationId(1482)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1463)),
+                        FieldValue::Reference(DeclarationId(1470)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2276),
                             payload: vec![],
                         },
                     ),
@@ -47449,31 +47671,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(1470),
+            id: DeclarationId(1477),
             name: Some("lens_complexity_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1459),
+                template: DeclarationId(1466),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1459)),
+            meta_tag: Some(DeclarationId(1466)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1476)),
+                        FieldValue::Reference(DeclarationId(1483)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1465)),
+                        FieldValue::Reference(DeclarationId(1472)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2253),
+                            constructor: DeclarationId(2276),
                             payload: vec![],
                         },
                     ),
@@ -47484,31 +47706,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(1471),
+            id: DeclarationId(1478),
             name: Some("emit_stage_binding".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1459),
+                template: DeclarationId(1466),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1459)),
+            meta_tag: Some(DeclarationId(1466)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
                 fields: vec![
                     (
                         "stage".to_string(),
-                        FieldValue::Reference(DeclarationId(1477)),
+                        FieldValue::Reference(DeclarationId(1484)),
                     ),
                     (
                         "realization".to_string(),
-                        FieldValue::Reference(DeclarationId(1464)),
+                        FieldValue::Reference(DeclarationId(1471)),
                     ),
                     (
                         "snapshot".to_string(),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2254),
+                            constructor: DeclarationId(2277),
                             payload: vec![],
                         },
                     ),
@@ -47519,12 +47741,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(1472),
+            id: DeclarationId(1479),
             name: Some("parse".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197), DeclarationId(197)],
                 output: DeclarationId(747),
-                body: ArrowBody::ExternalRealization(DeclarationId(1460)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1467)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47537,12 +47759,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(1473),
+            id: DeclarationId(1480),
             name: Some("lower".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747)],
                 output: DeclarationId(747),
-                body: ArrowBody::ExternalRealization(DeclarationId(1461)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1468)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47555,12 +47777,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(1474),
+            id: DeclarationId(1481),
             name: Some("infer".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747)],
                 output: DeclarationId(747),
-                body: ArrowBody::ExternalRealization(DeclarationId(1462)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1469)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47573,12 +47795,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(1475),
+            id: DeclarationId(1482),
             name: Some("compute_ownership".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747)],
                 output: DeclarationId(747),
-                body: ArrowBody::ExternalRealization(DeclarationId(1463)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1470)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47591,12 +47813,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(1476),
+            id: DeclarationId(1483),
             name: Some("lens_complexity".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747)],
                 output: DeclarationId(747),
-                body: ArrowBody::ExternalRealization(DeclarationId(1465)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1472)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47609,17 +47831,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(1477),
+            id: DeclarationId(1484),
             name: Some("emit".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![
                     DeclarationId(747),
                     DeclarationId(747),
                     DeclarationId(747),
-                    DeclarationId(943),
+                    DeclarationId(950),
                 ],
                 output: DeclarationId(197),
-                body: ArrowBody::ExternalRealization(DeclarationId(1464)),
+                body: ArrowBody::ExternalRealization(DeclarationId(1471)),
             },
             type_params: vec![],
             phantom_params: Vec::new(),
@@ -47632,10 +47854,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1478),
+            id: DeclarationId(1485),
             name: Some("compile".to_string()),
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(943)],
+                inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(950)],
                 output: DeclarationId(197),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/pipeline.dag",
@@ -47654,11 +47876,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(1479),
+            id: DeclarationId(1486),
             name: Some("from_symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(197)],
-                output: DeclarationId(2255),
+                output: DeclarationId(2278),
                 body: ArrowBody::Unparsed(SourceSpan::new(
                     "src/v3/compiler/operators.dag",
                     156,
@@ -47676,7 +47898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1480),
+            id: DeclarationId(1487),
             name: Some("symbol".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(725)],
@@ -47694,7 +47916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1481),
+            id: DeclarationId(1488),
             name: Some("algebra_field_name".to_string()),
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(725)],
@@ -47712,7 +47934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1482),
+            id: DeclarationId(1489),
             name: Some("LensRegistryEntry".to_string()),
             connective: TypeConnective::Conj {
                 children: vec![
@@ -47741,15 +47963,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(1483),
+            id: DeclarationId(1490),
             name: Some("lens_cost_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1482),
+                template: DeclarationId(1489),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1482)),
+            meta_tag: Some(DeclarationId(1489)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47777,15 +47999,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1484),
+            id: DeclarationId(1491),
             name: Some("lens_cost_symbolic_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1482),
+                template: DeclarationId(1489),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1482)),
+            meta_tag: Some(DeclarationId(1489)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47813,15 +48035,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2216, 2404),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1485),
+            id: DeclarationId(1492),
             name: Some("lens_effect_enumeration_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1482),
+                template: DeclarationId(1489),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1482)),
+            meta_tag: Some(DeclarationId(1489)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47849,15 +48071,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2406, 2623),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1486),
+            id: DeclarationId(1493),
             name: Some("lens_provenance_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1482),
+                template: DeclarationId(1489),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1482)),
+            meta_tag: Some(DeclarationId(1489)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47885,15 +48107,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2625, 2810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1487),
+            id: DeclarationId(1494),
             name: Some("lens_structural_resolution_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1482),
+                template: DeclarationId(1489),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1482)),
+            meta_tag: Some(DeclarationId(1489)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47924,15 +48146,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 2812, 3041),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1488),
+            id: DeclarationId(1495),
             name: Some("lens_unused_parameters_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1482),
+                template: DeclarationId(1489),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1482)),
+            meta_tag: Some(DeclarationId(1489)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47960,15 +48182,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3043, 3256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1489),
+            id: DeclarationId(1496),
             name: Some("lens_infer_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1482),
+                template: DeclarationId(1489),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1482)),
+            meta_tag: Some(DeclarationId(1489)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -47996,15 +48218,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 3883, 4075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1490),
+            id: DeclarationId(1497),
             name: Some("lens_variant_payload_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1482),
+                template: DeclarationId(1489),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1482)),
+            meta_tag: Some(DeclarationId(1489)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48032,15 +48254,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4077, 4277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1491),
+            id: DeclarationId(1498),
             name: Some("lens_lower_helpers_entry".to_string()),
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1482),
+                template: DeclarationId(1489),
                 arguments: vec![],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(1482)),
+            meta_tag: Some(DeclarationId(1489)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::Structural {
@@ -48068,17 +48290,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/regen.dag", 4527, 4719),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1492),
+            id: DeclarationId(1499),
             name: Some("IntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "OrderedRingAlgebra".to_string(),
-                        ty: DeclarationId(2256),
+                        ty: DeclarationId(2279),
                     },
                     Field {
                         label: "SemiringAlgebra".to_string(),
-                        ty: DeclarationId(2257),
+                        ty: DeclarationId(2280),
                     },
                 ],
             },
@@ -48093,17 +48315,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5528, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1493),
+            id: DeclarationId(1500),
             name: Some("NonIntegerAlgebra".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BooleanAlgebraAlgebra".to_string(),
-                        ty: DeclarationId(2258),
+                        ty: DeclarationId(2281),
                     },
                     Field {
                         label: "TerminalAlgebra".to_string(),
-                        ty: DeclarationId(2259),
+                        ty: DeclarationId(2282),
                     },
                 ],
             },
@@ -48118,37 +48340,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5592, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1494),
+            id: DeclarationId(1501),
             name: Some("TargetCarrier".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "BitCarrier".to_string(),
-                        ty: DeclarationId(2260),
+                        ty: DeclarationId(2283),
                     },
                     Field {
                         label: "ByteCarrier".to_string(),
-                        ty: DeclarationId(2261),
+                        ty: DeclarationId(2284),
                     },
                     Field {
                         label: "Word16Carrier".to_string(),
-                        ty: DeclarationId(2262),
+                        ty: DeclarationId(2285),
                     },
                     Field {
                         label: "Word32Carrier".to_string(),
-                        ty: DeclarationId(2263),
+                        ty: DeclarationId(2286),
                     },
                     Field {
                         label: "Word64Carrier".to_string(),
-                        ty: DeclarationId(2264),
+                        ty: DeclarationId(2287),
                     },
                     Field {
                         label: "Word128Carrier".to_string(),
-                        ty: DeclarationId(2265),
+                        ty: DeclarationId(2288),
                     },
                     Field {
                         label: "TerminalCarrier".to_string(),
-                        ty: DeclarationId(2266),
+                        ty: DeclarationId(2289),
                     },
                 ],
             },
@@ -48163,21 +48385,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7234, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1495),
+            id: DeclarationId(1502),
             name: Some("IntegerOverflow".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "TwoComplementWrap".to_string(),
-                        ty: DeclarationId(2267),
+                        ty: DeclarationId(2290),
                     },
                     Field {
                         label: "Saturating".to_string(),
-                        ty: DeclarationId(2268),
+                        ty: DeclarationId(2291),
                     },
                     Field {
                         label: "Trap".to_string(),
-                        ty: DeclarationId(2269),
+                        ty: DeclarationId(2292),
                     },
                 ],
             },
@@ -48192,17 +48414,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8093, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1496),
+            id: DeclarationId(1503),
             name: Some("RustPrimitive".to_string()),
             connective: TypeConnective::Disj {
                 variants: vec![
                     Field {
                         label: "IntegerPrimitive".to_string(),
-                        ty: DeclarationId(2270),
+                        ty: DeclarationId(2293),
                     },
                     Field {
                         label: "NonIntegerPrimitive".to_string(),
-                        ty: DeclarationId(2271),
+                        ty: DeclarationId(2294),
                     },
                 ],
             },
@@ -48217,94 +48439,94 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8914, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1497),
+            id: DeclarationId(1504),
             name: Some("rust_pilot_primitives".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1496),
+                    value: DeclarationId(1503),
                 }],
             },
             type_params: vec![],
             phantom_params: Vec::new(),
-            meta_tag: Some(DeclarationId(2272)),
+            meta_tag: Some(DeclarationId(2295)),
             specialization_parent: None,
             inhabits: None,
             value_body: Some(ValueBody::List(vec![
                 FieldValue::Variant {
-                    constructor: DeclarationId(2270),
+                    constructor: DeclarationId(2293),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2284),
                             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(2267),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2270),
+                    constructor: DeclarationId(2293),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2262),
+                            constructor: DeclarationId(2285),
                             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(2267),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2270),
+                    constructor: DeclarationId(2293),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2263),
+                            constructor: DeclarationId(2286),
                             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(2267),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2270),
+                    constructor: DeclarationId(2293),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2287),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -48313,21 +48535,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(2267),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2270),
+                    constructor: DeclarationId(2293),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("i128".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2256),
+                            constructor: DeclarationId(2279),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2265),
+                            constructor: DeclarationId(2288),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String(
@@ -48338,84 +48560,84 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2267),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2270),
+                    constructor: DeclarationId(2293),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u8".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2280),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2261),
+                            constructor: DeclarationId(2284),
                             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(2267),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2270),
+                    constructor: DeclarationId(2293),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u16".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2280),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2262),
+                            constructor: DeclarationId(2285),
                             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(2267),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2270),
+                    constructor: DeclarationId(2293),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u32".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2280),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2263),
+                            constructor: DeclarationId(2286),
                             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(2267),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2270),
+                    constructor: DeclarationId(2293),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("u64".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2257),
+                            constructor: DeclarationId(2280),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2264),
+                            constructor: DeclarationId(2287),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::String("0".to_string())),
@@ -48424,36 +48646,36 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         )),
                         FieldValue::Literal(LiteralBits::Bool(true)),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2267),
+                            constructor: DeclarationId(2290),
                             payload: vec![],
                         },
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2271),
+                    constructor: DeclarationId(2294),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("bool".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2258),
+                            constructor: DeclarationId(2281),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2260),
+                            constructor: DeclarationId(2283),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
                     ],
                 },
                 FieldValue::Variant {
-                    constructor: DeclarationId(2271),
+                    constructor: DeclarationId(2294),
                     payload: vec![
                         FieldValue::Literal(LiteralBits::String("()".to_string())),
                         FieldValue::Variant {
-                            constructor: DeclarationId(2259),
+                            constructor: DeclarationId(2282),
                             payload: vec![],
                         },
                         FieldValue::Variant {
-                            constructor: DeclarationId(2266),
+                            constructor: DeclarationId(2289),
                             payload: vec![],
                         },
                         FieldValue::Literal(LiteralBits::Bool(true)),
@@ -48465,7 +48687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9996, 13318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1498),
+            id: DeclarationId(1505),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48485,7 +48707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1499),
+            id: DeclarationId(1506),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48505,7 +48727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1500),
+            id: DeclarationId(1507),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48525,7 +48747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1501),
+            id: DeclarationId(1508),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48545,7 +48767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1502),
+            id: DeclarationId(1509),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48565,7 +48787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1503),
+            id: DeclarationId(1510),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(616), DeclarationId(615)],
@@ -48583,7 +48805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1504),
+            id: DeclarationId(1511),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48603,7 +48825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1505),
+            id: DeclarationId(1512),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(618), DeclarationId(619)],
@@ -48621,7 +48843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1506),
+            id: DeclarationId(1513),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48641,7 +48863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1507),
+            id: DeclarationId(1514),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48661,7 +48883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1508),
+            id: DeclarationId(1515),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48681,7 +48903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1509),
+            id: DeclarationId(1516),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48701,7 +48923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1510),
+            id: DeclarationId(1517),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(623)],
@@ -48719,7 +48941,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1511),
+            id: DeclarationId(1518),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48739,7 +48961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1512),
+            id: DeclarationId(1519),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48759,7 +48981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1513),
+            id: DeclarationId(1520),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(626)],
@@ -48777,7 +48999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1514),
+            id: DeclarationId(1521),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48797,7 +49019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1515),
+            id: DeclarationId(1522),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48817,7 +49039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1516),
+            id: DeclarationId(1523),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48837,11 +49059,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(1517),
+            id: DeclarationId(1524),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(628)],
-                output: DeclarationId(1516),
+                output: DeclarationId(1523),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -48855,7 +49077,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1518),
+            id: DeclarationId(1525),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48875,7 +49097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1519),
+            id: DeclarationId(1526),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48895,7 +49117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1520),
+            id: DeclarationId(1527),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48915,7 +49137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1521),
+            id: DeclarationId(1528),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48935,7 +49157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1522),
+            id: DeclarationId(1529),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(634),
@@ -48955,13 +49177,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(1523),
+            id: DeclarationId(1530),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1522),
+                    value: DeclarationId(1529),
                 }],
             },
             type_params: vec![],
@@ -48975,7 +49197,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1524),
+            id: DeclarationId(1531),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -48995,7 +49217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1525),
+            id: DeclarationId(1532),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(634),
@@ -49015,13 +49237,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(1526),
+            id: DeclarationId(1533),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1525),
+                    value: DeclarationId(1532),
                 }],
             },
             type_params: vec![],
@@ -49035,7 +49257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1527),
+            id: DeclarationId(1534),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49055,7 +49277,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(1528),
+            id: DeclarationId(1535),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49069,7 +49291,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1529),
+            id: DeclarationId(1536),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49089,7 +49311,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1530),
+            id: DeclarationId(1537),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49099,7 +49321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "tail".to_string(),
-                        ty: DeclarationId(1529),
+                        ty: DeclarationId(1536),
                     },
                 ],
             },
@@ -49114,7 +49336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1531),
+            id: DeclarationId(1538),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49134,7 +49356,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1532),
+            id: DeclarationId(1539),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49154,7 +49376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1533),
+            id: DeclarationId(1540),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49173,7 +49395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1534),
+            id: DeclarationId(1541),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(732),
@@ -49193,7 +49415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1535),
+            id: DeclarationId(1542),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(634),
@@ -49213,7 +49435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1536),
+            id: DeclarationId(1543),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(732),
@@ -49233,11 +49455,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(1537),
+            id: DeclarationId(1544),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1536),
+                    DeclarationId(1543),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -49252,7 +49474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1538),
+            id: DeclarationId(1545),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49272,7 +49494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1539),
+            id: DeclarationId(1546),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(732),
@@ -49292,11 +49514,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(1540),
+            id: DeclarationId(1547),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1539),
+                    DeclarationId(1546),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -49311,7 +49533,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1541),
+            id: DeclarationId(1548),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49331,7 +49553,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1542),
+            id: DeclarationId(1549),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49350,7 +49572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1543),
+            id: DeclarationId(1550),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49369,7 +49591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1544),
+            id: DeclarationId(1551),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -49388,7 +49610,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1545),
+            id: DeclarationId(1552),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49408,7 +49630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 37237, 37258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1546),
+            id: DeclarationId(1553),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49428,7 +49650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 37264, 37295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1547),
+            id: DeclarationId(1554),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49447,7 +49669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1548),
+            id: DeclarationId(1555),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49466,7 +49688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1549),
+            id: DeclarationId(1556),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49486,7 +49708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1550),
+            id: DeclarationId(1557),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49506,12 +49728,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(1551),
+            id: DeclarationId(1558),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "tokens".to_string(),
-                    ty: DeclarationId(1550),
+                    ty: DeclarationId(1557),
                 }],
             },
             type_params: vec![],
@@ -49525,7 +49747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1552),
+            id: DeclarationId(1559),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49550,7 +49772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1553),
+            id: DeclarationId(1560),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49569,7 +49791,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1554),
+            id: DeclarationId(1561),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49598,7 +49820,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(1555),
+            id: DeclarationId(1562),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49612,7 +49834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1556),
+            id: DeclarationId(1563),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49631,7 +49853,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1557),
+            id: DeclarationId(1564),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49650,7 +49872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1558),
+            id: DeclarationId(1565),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49669,7 +49891,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(1559),
+            id: DeclarationId(1566),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49683,7 +49905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1560),
+            id: DeclarationId(1567),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49702,7 +49924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1561),
+            id: DeclarationId(1568),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49721,7 +49943,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(1562),
+            id: DeclarationId(1569),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49735,7 +49957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1563),
+            id: DeclarationId(1570),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49754,7 +49976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1564),
+            id: DeclarationId(1571),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49773,7 +49995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1565),
+            id: DeclarationId(1572),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49792,7 +50014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1566),
+            id: DeclarationId(1573),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -49812,12 +50034,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(1567),
+            id: DeclarationId(1574),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1566),
+                    ty: DeclarationId(1573),
                 }],
             },
             type_params: vec![],
@@ -49831,7 +50053,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(1568),
+            id: DeclarationId(1575),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49845,7 +50067,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(1569),
+            id: DeclarationId(1576),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49859,7 +50081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1570),
+            id: DeclarationId(1577),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49878,7 +50100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1571),
+            id: DeclarationId(1578),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -49897,7 +50119,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1572),
+            id: DeclarationId(1579),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49922,7 +50144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1573),
+            id: DeclarationId(1580),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -49959,7 +50181,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(1574),
+            id: DeclarationId(1581),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -49973,7 +50195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1575),
+            id: DeclarationId(1582),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(732),
@@ -49993,12 +50215,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(1576),
+            id: DeclarationId(1583),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "first_breaker".to_string(),
-                    ty: DeclarationId(1575),
+                    ty: DeclarationId(1582),
                 }],
             },
             type_params: vec![],
@@ -50012,7 +50234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1577),
+            id: DeclarationId(1584),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -50032,12 +50254,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(1578),
+            id: DeclarationId(1585),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "ops".to_string(),
-                    ty: DeclarationId(1577),
+                    ty: DeclarationId(1584),
                 }],
             },
             type_params: vec![],
@@ -50051,7 +50273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1579),
+            id: DeclarationId(1586),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -50071,12 +50293,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(1580),
+            id: DeclarationId(1587),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "arms".to_string(),
-                    ty: DeclarationId(1579),
+                    ty: DeclarationId(1586),
                 }],
             },
             type_params: vec![],
@@ -50090,7 +50312,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1581),
+            id: DeclarationId(1588),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50109,7 +50331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1582),
+            id: DeclarationId(1589),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -50129,12 +50351,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(1583),
+            id: DeclarationId(1590),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "branches".to_string(),
-                    ty: DeclarationId(1582),
+                    ty: DeclarationId(1589),
                 }],
             },
             type_params: vec![],
@@ -50148,7 +50370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1584),
+            id: DeclarationId(1591),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50167,7 +50389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1585),
+            id: DeclarationId(1592),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50186,7 +50408,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(1586),
+            id: DeclarationId(1593),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50200,7 +50422,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(1587),
+            id: DeclarationId(1594),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50214,7 +50436,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(1588),
+            id: DeclarationId(1595),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50228,7 +50450,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(1589),
+            id: DeclarationId(1596),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50242,7 +50464,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(1590),
+            id: DeclarationId(1597),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50256,7 +50478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1591),
+            id: DeclarationId(1598),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50275,7 +50497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1592),
+            id: DeclarationId(1599),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50294,7 +50516,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(1593),
+            id: DeclarationId(1600),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50308,7 +50530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33114, 33120),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1594),
+            id: DeclarationId(1601),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50327,7 +50549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33125, 33162),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1595),
+            id: DeclarationId(1602),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50346,7 +50568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33167, 33204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1596),
+            id: DeclarationId(1603),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50360,7 +50582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33678, 33697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1597),
+            id: DeclarationId(1604),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50379,7 +50601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/effects.dag", 33702, 33751),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1598),
+            id: DeclarationId(1605),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50398,7 +50620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19513, 19521),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1599),
+            id: DeclarationId(1606),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50417,7 +50639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19570, 19579),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1600),
+            id: DeclarationId(1607),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50436,7 +50658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 19645, 19654),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1601),
+            id: DeclarationId(1608),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50455,7 +50677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 20031, 20043),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1602),
+            id: DeclarationId(1609),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50474,12 +50696,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 20352, 20367),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1603),
+            id: DeclarationId(1610),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(644),
                 }],
             },
@@ -50494,12 +50716,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24351, 24372),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1604),
+            id: DeclarationId(1611),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(644),
                 }],
             },
@@ -50514,7 +50736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 24436, 24457),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1605),
+            id: DeclarationId(1612),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50528,7 +50750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1606),
+            id: DeclarationId(1613),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50547,7 +50769,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(1607),
+            id: DeclarationId(1614),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50561,7 +50783,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1608),
+            id: DeclarationId(1615),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -50580,7 +50802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1609),
+            id: DeclarationId(1616),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50599,7 +50821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 791, 802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1610),
+            id: DeclarationId(1617),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50618,7 +50840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 807, 820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1611),
+            id: DeclarationId(1618),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50637,7 +50859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 825, 842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1612),
+            id: DeclarationId(1619),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50656,7 +50878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 2873, 2893),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1613),
+            id: DeclarationId(1620),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50675,7 +50897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 2898, 2926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1614),
+            id: DeclarationId(1621),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50694,7 +50916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 2931, 2965),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1615),
+            id: DeclarationId(1622),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50713,7 +50935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 2970, 2999),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1616),
+            id: DeclarationId(1623),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50732,7 +50954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3004, 3021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1617),
+            id: DeclarationId(1624),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50746,7 +50968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3645, 3652),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1618),
+            id: DeclarationId(1625),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50765,7 +50987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 3657, 3707),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1619),
+            id: DeclarationId(1626),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50784,7 +51006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5271, 5295),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1620),
+            id: DeclarationId(1627),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50798,7 +51020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5320, 5329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1621),
+            id: DeclarationId(1628),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50817,7 +51039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5334, 5370),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1622),
+            id: DeclarationId(1629),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -50842,7 +51064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5682, 5732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1623),
+            id: DeclarationId(1630),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50856,7 +51078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 5737, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1624),
+            id: DeclarationId(1631),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(706),
@@ -50876,12 +51098,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6322, 6335),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1625),
+            id: DeclarationId(1632),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1624),
+                    ty: DeclarationId(1631),
                 }],
             },
             type_params: vec![],
@@ -50895,7 +51117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6310, 6336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1626),
+            id: DeclarationId(1633),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50909,7 +51131,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6341, 6358),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1627),
+            id: DeclarationId(1634),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50928,7 +51150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6609, 6619),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1628),
+            id: DeclarationId(1635),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50942,7 +51164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6624, 6633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1629),
+            id: DeclarationId(1636),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -50956,7 +51178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 6638, 6647),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1630),
+            id: DeclarationId(1637),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50975,7 +51197,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7074, 7094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1631),
+            id: DeclarationId(1638),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -50994,7 +51216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7099, 7123),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1632),
+            id: DeclarationId(1639),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51014,12 +51236,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7135, 7151),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1633),
+            id: DeclarationId(1640),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1632),
+                    ty: DeclarationId(1639),
                 }],
             },
             type_params: vec![],
@@ -51033,7 +51255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7128, 7152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1634),
+            id: DeclarationId(1641),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51053,12 +51275,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7162, 7178),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1635),
+            id: DeclarationId(1642),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1634),
+                    ty: DeclarationId(1641),
                 }],
             },
             type_params: vec![],
@@ -51072,7 +51294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7157, 7179),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1636),
+            id: DeclarationId(1643),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51092,12 +51314,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7188, 7204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1637),
+            id: DeclarationId(1644),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1636),
+                    ty: DeclarationId(1643),
                 }],
             },
             type_params: vec![],
@@ -51111,7 +51333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7184, 7205),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1638),
+            id: DeclarationId(1645),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51131,7 +51353,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7268, 7284),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1639),
+            id: DeclarationId(1646),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51141,7 +51363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1638),
+                        ty: DeclarationId(1645),
                     },
                 ],
             },
@@ -51156,7 +51378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7210, 7290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1640),
+            id: DeclarationId(1647),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51175,7 +51397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7449, 7478),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1641),
+            id: DeclarationId(1648),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51195,12 +51417,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7513, 7529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1642),
+            id: DeclarationId(1649),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "fields".to_string(),
-                    ty: DeclarationId(1641),
+                    ty: DeclarationId(1648),
                 }],
             },
             type_params: vec![],
@@ -51214,7 +51436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7483, 7531),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1643),
+            id: DeclarationId(1650),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51234,12 +51456,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7549, 7565),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1644),
+            id: DeclarationId(1651),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1643),
+                    ty: DeclarationId(1650),
                 }],
             },
             type_params: vec![],
@@ -51253,7 +51475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 7536, 7566),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1645),
+            id: DeclarationId(1652),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51272,7 +51494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8820, 8843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1646),
+            id: DeclarationId(1653),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51291,7 +51513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8848, 8882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1647),
+            id: DeclarationId(1654),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51305,7 +51527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8887, 8894),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1648),
+            id: DeclarationId(1655),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51319,7 +51541,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8899, 8905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1649),
+            id: DeclarationId(1656),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51338,7 +51560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 8910, 8930),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1650),
+            id: DeclarationId(1657),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51357,7 +51579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9159, 9176),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1651),
+            id: DeclarationId(1658),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51377,12 +51599,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9198, 9213),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1652),
+            id: DeclarationId(1659),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "children".to_string(),
-                    ty: DeclarationId(1651),
+                    ty: DeclarationId(1658),
                 }],
             },
             type_params: vec![],
@@ -51396,7 +51618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9181, 9215),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1653),
+            id: DeclarationId(1660),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51416,12 +51638,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9237, 9252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1654),
+            id: DeclarationId(1661),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "variants".to_string(),
-                    ty: DeclarationId(1653),
+                    ty: DeclarationId(1660),
                 }],
             },
             type_params: vec![],
@@ -51435,7 +51657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9220, 9254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1655),
+            id: DeclarationId(1662),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51455,13 +51677,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9281, 9300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1656),
+            id: DeclarationId(1663),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "inputs".to_string(),
-                        ty: DeclarationId(1655),
+                        ty: DeclarationId(1662),
                     },
                     Field {
                         label: "output".to_string(),
@@ -51484,7 +51706,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9259, 9356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1657),
+            id: DeclarationId(1664),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51509,7 +51731,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9361, 9439),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1658),
+            id: DeclarationId(1665),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51529,7 +51751,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9507, 9529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1659),
+            id: DeclarationId(1666),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51539,7 +51761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "arguments".to_string(),
-                        ty: DeclarationId(1658),
+                        ty: DeclarationId(1665),
                     },
                 ],
             },
@@ -51554,7 +51776,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9444, 9535),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1660),
+            id: DeclarationId(1667),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51573,7 +51795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9584, 9591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1661),
+            id: DeclarationId(1668),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51593,7 +51815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9636, 9655),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1662),
+            id: DeclarationId(1669),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51613,7 +51835,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9674, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1663),
+            id: DeclarationId(1670),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51632,7 +51854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9709, 9723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1664),
+            id: DeclarationId(1671),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51651,7 +51873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9736, 9750),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1665),
+            id: DeclarationId(1672),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51670,7 +51892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9765, 9775),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1666),
+            id: DeclarationId(1673),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51689,7 +51911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 9795, 9810),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1667),
+            id: DeclarationId(1674),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -51709,7 +51931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 10933, 10952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1668),
+            id: DeclarationId(1675),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51723,7 +51945,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11233, 11236),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1669),
+            id: DeclarationId(1676),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51737,7 +51959,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11241, 11244),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1670),
+            id: DeclarationId(1677),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51751,7 +51973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11249, 11252),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1671),
+            id: DeclarationId(1678),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51765,7 +51987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11257, 11260),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1672),
+            id: DeclarationId(1679),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51779,7 +52001,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11384, 11386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1673),
+            id: DeclarationId(1680),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51793,7 +52015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11391, 11393),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1674),
+            id: DeclarationId(1681),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51807,7 +52029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11398, 11400),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1675),
+            id: DeclarationId(1682),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51821,7 +52043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11405, 11407),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1676),
+            id: DeclarationId(1683),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51835,7 +52057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11412, 11414),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1677),
+            id: DeclarationId(1684),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51849,7 +52071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11419, 11421),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1678),
+            id: DeclarationId(1685),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51863,7 +52085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11674, 11677),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1679),
+            id: DeclarationId(1686),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -51877,7 +52099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11682, 11684),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1680),
+            id: DeclarationId(1687),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51896,7 +52118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11920, 11944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1681),
+            id: DeclarationId(1688),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51915,7 +52137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11949, 11973),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1682),
+            id: DeclarationId(1689),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51934,7 +52156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 11978, 11996),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1683),
+            id: DeclarationId(1690),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -51953,7 +52175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12183, 12206),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1684),
+            id: DeclarationId(1691),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -51972,7 +52194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12271, 12285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1685),
+            id: DeclarationId(1692),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -51982,7 +52204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "field_child".to_string(),
-                        ty: DeclarationId(1684),
+                        ty: DeclarationId(1691),
                     },
                 ],
             },
@@ -51997,7 +52219,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12211, 12291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1686),
+            id: DeclarationId(1693),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52016,7 +52238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12296, 12318),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1687),
+            id: DeclarationId(1694),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52041,7 +52263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12443, 12495),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1688),
+            id: DeclarationId(1695),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52060,7 +52282,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12500, 12530),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1689),
+            id: DeclarationId(1696),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52079,7 +52301,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 12694, 12709),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1690),
+            id: DeclarationId(1697),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -52099,7 +52321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14685, 14716),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1691),
+            id: DeclarationId(1698),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(646),
@@ -52119,7 +52341,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 14740, 14770),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1692),
+            id: DeclarationId(1699),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52138,7 +52360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15393, 15422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1693),
+            id: DeclarationId(1700),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -52163,7 +52385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15427, 15474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1694),
+            id: DeclarationId(1701),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52182,7 +52404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15743, 15758),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1695),
+            id: DeclarationId(1702),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52202,7 +52424,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 15832, 15844),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1696),
+            id: DeclarationId(1703),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52216,7 +52438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16085, 16094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1697),
+            id: DeclarationId(1704),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52236,7 +52458,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16152, 16168),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1698),
+            id: DeclarationId(1705),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52255,7 +52477,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16232, 16256),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1699),
+            id: DeclarationId(1706),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52269,7 +52491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16670, 16682),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1700),
+            id: DeclarationId(1707),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52289,7 +52511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16760, 16772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1701),
+            id: DeclarationId(1708),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52308,7 +52530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16810, 16825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1702),
+            id: DeclarationId(1709),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -52327,7 +52549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16848, 16870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1703),
+            id: DeclarationId(1710),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52346,7 +52568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16962, 16978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1704),
+            id: DeclarationId(1711),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52365,7 +52587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 16983, 17007),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1705),
+            id: DeclarationId(1712),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52384,7 +52606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17012, 17030),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1706),
+            id: DeclarationId(1713),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52403,7 +52625,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17035, 17049),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1707),
+            id: DeclarationId(1714),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52422,7 +52644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17054, 17068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1708),
+            id: DeclarationId(1715),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52442,7 +52664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17097, 17114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1709),
+            id: DeclarationId(1716),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52462,7 +52684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17124, 17138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1710),
+            id: DeclarationId(1717),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52482,7 +52704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17148, 17161),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1711),
+            id: DeclarationId(1718),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52502,7 +52724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 17174, 17187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1712),
+            id: DeclarationId(1719),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -52521,7 +52743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22393, 22411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1713),
+            id: DeclarationId(1720),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -52535,7 +52757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22416, 22422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1714),
+            id: DeclarationId(1721),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -52555,12 +52777,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22455, 22479),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1715),
+            id: DeclarationId(1722),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "candidates".to_string(),
-                    ty: DeclarationId(1714),
+                    ty: DeclarationId(1721),
                 }],
             },
             type_params: vec![],
@@ -52574,12 +52796,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/substrate.dag", 22427, 22481),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1716),
+            id: DeclarationId(1723),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(765),
                 }],
             },
@@ -52594,12 +52816,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10750, 10770),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1717),
+            id: DeclarationId(1724),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(765),
                 }],
             },
@@ -52614,7 +52836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10834, 10854),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1718),
+            id: DeclarationId(1725),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -52634,7 +52856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 10922, 10952),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1719),
+            id: DeclarationId(1726),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52654,7 +52876,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11419, 11437),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1720),
+            id: DeclarationId(1727),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -52674,7 +52896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11443, 11473),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1721),
+            id: DeclarationId(1728),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52694,7 +52916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 13970, 13988),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1722),
+            id: DeclarationId(1729),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -52714,7 +52936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18369, 18399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1723),
+            id: DeclarationId(1730),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52734,7 +52956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18404, 18422),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1724),
+            id: DeclarationId(1731),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52754,7 +52976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18682, 18700),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1725),
+            id: DeclarationId(1732),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52774,7 +52996,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18705, 18723),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1726),
+            id: DeclarationId(1733),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52794,7 +53016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19196, 19214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1727),
+            id: DeclarationId(1734),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52814,7 +53036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19219, 19237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1728),
+            id: DeclarationId(1735),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52834,7 +53056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19338, 19356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1729),
+            id: DeclarationId(1736),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52854,7 +53076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19676, 19694),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1730),
+            id: DeclarationId(1737),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52874,7 +53096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19699, 19717),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1731),
+            id: DeclarationId(1738),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52894,7 +53116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 21265, 21283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1732),
+            id: DeclarationId(1739),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52914,7 +53136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 21536, 21554),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1733),
+            id: DeclarationId(1740),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52934,7 +53156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 22002, 22020),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1734),
+            id: DeclarationId(1741),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52954,7 +53176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24037, 24055),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1735),
+            id: DeclarationId(1742),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52974,7 +53196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24085, 24103),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1736),
+            id: DeclarationId(1743),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -52994,7 +53216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24390, 24408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1737),
+            id: DeclarationId(1744),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53014,7 +53236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24436, 24454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1738),
+            id: DeclarationId(1745),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53034,7 +53256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24814, 24832),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1739),
+            id: DeclarationId(1746),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -53054,7 +53276,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24837, 24855),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1740),
+            id: DeclarationId(1747),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53068,7 +53290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4837, 4849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1741),
+            id: DeclarationId(1748),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53082,7 +53304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4854, 4870),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1742),
+            id: DeclarationId(1749),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53096,7 +53318,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 4875, 4889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1743),
+            id: DeclarationId(1750),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53110,7 +53332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5739, 5752),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1744),
+            id: DeclarationId(1751),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53124,7 +53346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5757, 5772),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1745),
+            id: DeclarationId(1752),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53138,7 +53360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5777, 5793),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1746),
+            id: DeclarationId(1753),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53152,7 +53374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 5798, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1747),
+            id: DeclarationId(1754),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53171,7 +53393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6664, 6685),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1748),
+            id: DeclarationId(1755),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53190,7 +53412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6700, 6710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1749),
+            id: DeclarationId(1756),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -53209,7 +53431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 6740, 6744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1750),
+            id: DeclarationId(1757),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -53223,7 +53445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8213, 8222),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1751),
+            id: DeclarationId(1758),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53242,7 +53464,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 8227, 8273),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1752),
+            id: DeclarationId(1759),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53261,7 +53483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9314, 9331),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1753),
+            id: DeclarationId(1760),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53280,7 +53502,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9336, 9360),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1754),
+            id: DeclarationId(1761),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -53305,7 +53527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9365, 9427),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1755),
+            id: DeclarationId(1762),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -53325,12 +53547,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9444, 9474),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1756),
+            id: DeclarationId(1763),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1755),
+                    ty: DeclarationId(1762),
                 }],
             },
             type_params: vec![],
@@ -53344,7 +53566,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9432, 9475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1757),
+            id: DeclarationId(1764),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(648),
@@ -53364,12 +53586,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9488, 9518),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1758),
+            id: DeclarationId(1765),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1757),
+                    ty: DeclarationId(1764),
                 }],
             },
             type_params: vec![],
@@ -53383,7 +53605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9480, 9519),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1759),
+            id: DeclarationId(1766),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53402,7 +53624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9524, 9545),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1760),
+            id: DeclarationId(1767),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -53421,7 +53643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9550, 9569),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1761),
+            id: DeclarationId(1768),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(31),
@@ -53441,7 +53663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 9287, 9309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1762),
+            id: DeclarationId(1769),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -53461,7 +53683,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11303, 11315),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1763),
+            id: DeclarationId(1770),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(649)],
@@ -53479,7 +53701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1764),
+            id: DeclarationId(1771),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(625),
@@ -53489,7 +53711,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(765),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1513),
+                        parameter: DeclarationId(1520),
                         value: DeclarationId(772),
                     },
                 ],
@@ -53505,7 +53727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11296, 11343),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1765),
+            id: DeclarationId(1772),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(612),
@@ -53525,7 +53747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 11603, 11618),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1766),
+            id: DeclarationId(1773),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(765), DeclarationId(765)],
@@ -53543,7 +53765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1767),
+            id: DeclarationId(1774),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(614),
@@ -53557,7 +53779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(765),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1503),
+                        parameter: DeclarationId(1510),
                         value: DeclarationId(776),
                     },
                 ],
@@ -53573,7 +53795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 14010, 14053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1768),
+            id: DeclarationId(1775),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(766), DeclarationId(615)],
@@ -53591,7 +53813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1769),
+            id: DeclarationId(1776),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(614),
@@ -53601,7 +53823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(766),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1503),
+                        parameter: DeclarationId(1510),
                         value: DeclarationId(797),
                     },
                     TemplateArgument {
@@ -53621,7 +53843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 16719, 16829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1770),
+            id: DeclarationId(1777),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(766), DeclarationId(615)],
@@ -53639,7 +53861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1771),
+            id: DeclarationId(1778),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(614),
@@ -53649,7 +53871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(766),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1503),
+                        parameter: DeclarationId(1510),
                         value: DeclarationId(797),
                     },
                     TemplateArgument {
@@ -53669,7 +53891,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 16884, 16994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1772),
+            id: DeclarationId(1779),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -53689,7 +53911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18445, 18475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1773),
+            id: DeclarationId(1780),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -53709,7 +53931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18427, 18476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1774),
+            id: DeclarationId(1781),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53729,7 +53951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18755, 18762),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1775),
+            id: DeclarationId(1782),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -53749,7 +53971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 18889, 18941),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1776),
+            id: DeclarationId(1783),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53769,7 +53991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19292, 19299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1777),
+            id: DeclarationId(1784),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -53789,7 +54011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19270, 19300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1778),
+            id: DeclarationId(1785),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53809,7 +54031,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19749, 19756),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1779),
+            id: DeclarationId(1786),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -53829,7 +54051,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 19887, 19944),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1780),
+            id: DeclarationId(1787),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -53849,7 +54071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 21469, 21501),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1781),
+            id: DeclarationId(1788),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53869,7 +54091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24140, 24147),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1782),
+            id: DeclarationId(1789),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -53889,7 +54111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24288, 24353),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1783),
+            id: DeclarationId(1790),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(766), DeclarationId(765)],
@@ -53907,7 +54129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1784),
+            id: DeclarationId(1791),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(614),
@@ -53921,7 +54143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                         value: DeclarationId(765),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1503),
+                        parameter: DeclarationId(1510),
                         value: DeclarationId(797),
                     },
                 ],
@@ -53937,7 +54159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24471, 24529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1785),
+            id: DeclarationId(1792),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(610),
@@ -53957,7 +54179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24555, 24601),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1786),
+            id: DeclarationId(1793),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(608),
@@ -53977,11 +54199,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24872, 24879),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1787),
+            id: DeclarationId(1794),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1739), DeclarationId(765)],
-                output: DeclarationId(1739),
+                inputs: vec![DeclarationId(1746), DeclarationId(765)],
+                output: DeclarationId(1746),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -53995,21 +54217,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1788),
+            id: DeclarationId(1795),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(614),
                 arguments: vec![
                     TemplateArgument {
                         parameter: DeclarationId(616),
-                        value: DeclarationId(1739),
+                        value: DeclarationId(1746),
                     },
                     TemplateArgument {
                         parameter: DeclarationId(615),
                         value: DeclarationId(765),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(1503),
+                        parameter: DeclarationId(1510),
                         value: DeclarationId(800),
                     },
                 ],
@@ -54025,7 +54247,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/algebra.dag", 24860, 24901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1789),
+            id: DeclarationId(1796),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54045,7 +54267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1790),
+            id: DeclarationId(1797),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54064,7 +54286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1791),
+            id: DeclarationId(1798),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54083,13 +54305,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(1792),
+            id: DeclarationId(1799),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1051),
+                    value: DeclarationId(1058),
                 }],
             },
             type_params: vec![],
@@ -54103,7 +54325,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1793),
+            id: DeclarationId(1800),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54123,12 +54345,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(1794),
+            id: DeclarationId(1801),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1793),
+                    ty: DeclarationId(1800),
                 }],
             },
             type_params: vec![],
@@ -54142,7 +54364,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1795),
+            id: DeclarationId(1802),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54162,12 +54384,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(1796),
+            id: DeclarationId(1803),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "content".to_string(),
-                    ty: DeclarationId(1795),
+                    ty: DeclarationId(1802),
                 }],
             },
             type_params: vec![],
@@ -54181,7 +54403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1797),
+            id: DeclarationId(1804),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54206,7 +54428,7 @@ 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(1798),
+            id: DeclarationId(1805),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54225,7 +54447,7 @@ 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(1799),
+            id: DeclarationId(1806),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54244,7 +54466,7 @@ 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(1800),
+            id: DeclarationId(1807),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54263,7 +54485,7 @@ 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(1801),
+            id: DeclarationId(1808),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54282,7 +54504,7 @@ 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(1802),
+            id: DeclarationId(1809),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54302,12 +54524,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(1803),
+            id: DeclarationId(1810),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "blocks".to_string(),
-                    ty: DeclarationId(1802),
+                    ty: DeclarationId(1809),
                 }],
             },
             type_params: vec![],
@@ -54321,7 +54543,7 @@ 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(1804),
+            id: DeclarationId(1811),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54340,7 +54562,7 @@ 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(1805),
+            id: DeclarationId(1812),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54359,7 +54581,7 @@ 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(1806),
+            id: DeclarationId(1813),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54378,7 +54600,7 @@ 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(1807),
+            id: DeclarationId(1814),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54388,11 +54610,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "content".to_string(),
-                        ty: DeclarationId(1805),
+                        ty: DeclarationId(1812),
                     },
                     Field {
                         label: "is_error".to_string(),
-                        ty: DeclarationId(1806),
+                        ty: DeclarationId(1813),
                     },
                 ],
             },
@@ -54407,7 +54629,7 @@ 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(1808),
+            id: DeclarationId(1815),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -54426,7 +54648,7 @@ 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(1809),
+            id: DeclarationId(1816),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54455,7 +54677,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(1810),
+            id: DeclarationId(1817),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54469,7 +54691,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(1811),
+            id: DeclarationId(1818),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54483,7 +54705,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(1812),
+            id: DeclarationId(1819),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54497,7 +54719,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(1813),
+            id: DeclarationId(1820),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54511,7 +54733,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(1814),
+            id: DeclarationId(1821),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54525,7 +54747,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(1815),
+            id: DeclarationId(1822),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54539,7 +54761,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(1816),
+            id: DeclarationId(1823),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -54553,7 +54775,7 @@ 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(1817),
+            id: DeclarationId(1824),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54572,7 +54794,7 @@ 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(1818),
+            id: DeclarationId(1825),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54591,7 +54813,7 @@ 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(1819),
+            id: DeclarationId(1826),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54605,11 +54827,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1817),
+                        ty: DeclarationId(1824),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1818),
+                        ty: DeclarationId(1825),
                     },
                     Field {
                         label: "start_char_index".to_string(),
@@ -54632,7 +54854,7 @@ 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(1820),
+            id: DeclarationId(1827),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54651,7 +54873,7 @@ 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(1821),
+            id: DeclarationId(1828),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54670,7 +54892,7 @@ 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(1822),
+            id: DeclarationId(1829),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54684,11 +54906,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1820),
+                        ty: DeclarationId(1827),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1821),
+                        ty: DeclarationId(1828),
                     },
                     Field {
                         label: "start_page_number".to_string(),
@@ -54711,7 +54933,7 @@ 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(1823),
+            id: DeclarationId(1830),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54730,7 +54952,7 @@ 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(1824),
+            id: DeclarationId(1831),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54749,7 +54971,7 @@ 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(1825),
+            id: DeclarationId(1832),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54763,11 +54985,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "document_title".to_string(),
-                        ty: DeclarationId(1823),
+                        ty: DeclarationId(1830),
                     },
                     Field {
                         label: "file_id".to_string(),
-                        ty: DeclarationId(1824),
+                        ty: DeclarationId(1831),
                     },
                     Field {
                         label: "start_block_index".to_string(),
@@ -54790,7 +55012,7 @@ 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(1826),
+            id: DeclarationId(1833),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54809,7 +55031,7 @@ 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(1827),
+            id: DeclarationId(1834),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54823,7 +55045,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1826),
+                        ty: DeclarationId(1833),
                     },
                     Field {
                         label: "url".to_string(),
@@ -54842,7 +55064,7 @@ 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(1828),
+            id: DeclarationId(1835),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54861,7 +55083,7 @@ 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(1829),
+            id: DeclarationId(1836),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -54875,7 +55097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "title".to_string(),
-                        ty: DeclarationId(1828),
+                        ty: DeclarationId(1835),
                     },
                     Field {
                         label: "search_result_index".to_string(),
@@ -54902,7 +55124,7 @@ 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(1830),
+            id: DeclarationId(1837),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -54922,11 +55144,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6514, 6548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1831),
+            id: DeclarationId(1838),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1830),
+                    DeclarationId(1837),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -54941,7 +55163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6514, 6549),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1832),
+            id: DeclarationId(1839),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54960,7 +55182,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6801, 6805),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1833),
+            id: DeclarationId(1840),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54979,7 +55201,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6837, 6841),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1834),
+            id: DeclarationId(1841),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -54998,7 +55220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6873, 6880),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1835),
+            id: DeclarationId(1842),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55018,7 +55240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7350, 7385),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1836),
+            id: DeclarationId(1843),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -55037,7 +55259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7464, 7471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1837),
+            id: DeclarationId(1844),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -55056,7 +55278,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7532, 7537),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1838),
+            id: DeclarationId(1845),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55070,7 +55292,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1207, 1220),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1839),
+            id: DeclarationId(1846),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55084,7 +55306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1225, 1231),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1840),
+            id: DeclarationId(1847),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55098,7 +55320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1236, 1254),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1841),
+            id: DeclarationId(1848),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55112,7 +55334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1259, 1277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1842),
+            id: DeclarationId(1849),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55126,7 +55348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1282, 1296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1843),
+            id: DeclarationId(1850),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55140,7 +55362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1578, 1587),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1844),
+            id: DeclarationId(1851),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55165,7 +55387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1592, 1669),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1845),
+            id: DeclarationId(1852),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -55190,7 +55412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1674, 1744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1846),
+            id: DeclarationId(1853),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55204,7 +55426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1984, 1989),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1847),
+            id: DeclarationId(1854),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55218,7 +55440,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 1992, 2000),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1848),
+            id: DeclarationId(1855),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55232,7 +55454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2003, 2023),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1849),
+            id: DeclarationId(1856),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55246,7 +55468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2273, 2283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1850),
+            id: DeclarationId(1857),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55260,7 +55482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2286, 2300),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1851),
+            id: DeclarationId(1858),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55274,7 +55496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2555, 2567),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1852),
+            id: DeclarationId(1859),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55288,7 +55510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2570, 2580),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1853),
+            id: DeclarationId(1860),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55302,7 +55524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2898, 2910),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1854),
+            id: DeclarationId(1861),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55316,7 +55538,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2913, 2929),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1855),
+            id: DeclarationId(1862),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55330,7 +55552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 2932, 2943),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1856),
+            id: DeclarationId(1863),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(39),
@@ -55350,7 +55572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/approximate_field.dag", 3588, 3596),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1857),
+            id: DeclarationId(1864),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55364,7 +55586,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(1858),
+            id: DeclarationId(1865),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55378,7 +55600,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(1859),
+            id: DeclarationId(1866),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55392,7 +55614,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(1860),
+            id: DeclarationId(1867),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55406,7 +55628,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(1861),
+            id: DeclarationId(1868),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55420,7 +55642,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(1862),
+            id: DeclarationId(1869),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55434,7 +55656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4314, 4321),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1863),
+            id: DeclarationId(1870),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55448,7 +55670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4326, 4330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1864),
+            id: DeclarationId(1871),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55468,7 +55690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6578, 6599),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1865),
+            id: DeclarationId(1872),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55482,7 +55704,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(1866),
+            id: DeclarationId(1873),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55496,7 +55718,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(1867),
+            id: DeclarationId(1874),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55510,7 +55732,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(1868),
+            id: DeclarationId(1875),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55524,7 +55746,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(1869),
+            id: DeclarationId(1876),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55538,7 +55760,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(1870),
+            id: DeclarationId(1877),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55552,7 +55774,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(1871),
+            id: DeclarationId(1878),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55566,7 +55788,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(1872),
+            id: DeclarationId(1879),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55580,7 +55802,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(1873),
+            id: DeclarationId(1880),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55594,7 +55816,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(1874),
+            id: DeclarationId(1881),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55608,7 +55830,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(1875),
+            id: DeclarationId(1882),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55622,7 +55844,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(1876),
+            id: DeclarationId(1883),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55636,7 +55858,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(1877),
+            id: DeclarationId(1884),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55650,7 +55872,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(1878),
+            id: DeclarationId(1885),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55664,7 +55886,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(1879),
+            id: DeclarationId(1886),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55678,7 +55900,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(1880),
+            id: DeclarationId(1887),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55692,7 +55914,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(1881),
+            id: DeclarationId(1888),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55706,7 +55928,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(1882),
+            id: DeclarationId(1889),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55720,7 +55942,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(1883),
+            id: DeclarationId(1890),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55734,7 +55956,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(1884),
+            id: DeclarationId(1891),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55748,7 +55970,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(1885),
+            id: DeclarationId(1892),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55762,7 +55984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1886),
+            id: DeclarationId(1893),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -55782,7 +56004,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(1887),
+            id: DeclarationId(1894),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55796,7 +56018,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(1888),
+            id: DeclarationId(1895),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55810,7 +56032,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(1889),
+            id: DeclarationId(1896),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55824,7 +56046,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(1890),
+            id: DeclarationId(1897),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -55838,7 +56060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1891),
+            id: DeclarationId(1898),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -55857,7 +56079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 5361, 5368),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1892),
+            id: DeclarationId(1899),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -55876,7 +56098,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 6292, 6296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1893),
+            id: DeclarationId(1900),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -55895,7 +56117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7350, 7369),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1894),
+            id: DeclarationId(1901),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -55914,7 +56136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7915, 7934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1895),
+            id: DeclarationId(1902),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55933,7 +56155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1356, 1388),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1896),
+            id: DeclarationId(1903),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55952,7 +56174,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1393, 1429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1897),
+            id: DeclarationId(1904),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55971,7 +56193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1434, 1471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1898),
+            id: DeclarationId(1905),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -55990,7 +56212,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1476, 1502),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1899),
+            id: DeclarationId(1906),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56009,7 +56231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1507, 1540),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1900),
+            id: DeclarationId(1907),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56023,12 +56245,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1545, 1562),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1901),
+            id: DeclarationId(1908),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1060),
+                    ty: DeclarationId(1067),
                 }],
             },
             type_params: vec![],
@@ -56042,7 +56264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1567, 1621),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1902),
+            id: DeclarationId(1909),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56056,7 +56278,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 1626, 1633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1903),
+            id: DeclarationId(1910),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56075,13 +56297,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2165, 2203),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1904),
+            id: DeclarationId(1911),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "amount".to_string(),
-                        ty: DeclarationId(1060),
+                        ty: DeclarationId(1067),
                     },
                     Field {
                         label: "collection".to_string(),
@@ -56100,13 +56322,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2208, 2282),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1905),
+            id: DeclarationId(1912),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "steps".to_string(),
-                        ty: DeclarationId(1060),
+                        ty: DeclarationId(1067),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -56125,13 +56347,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2287, 2362),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1906),
+            id: DeclarationId(1913),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "divisor".to_string(),
-                        ty: DeclarationId(1061),
+                        ty: DeclarationId(1068),
                     },
                     Field {
                         label: "ring_param".to_string(),
@@ -56150,7 +56372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2367, 2440),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1907),
+            id: DeclarationId(1914),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56169,7 +56391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2445, 2482),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1908),
+            id: DeclarationId(1915),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56188,7 +56410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2487, 2524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1909),
+            id: DeclarationId(1916),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56207,7 +56429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2529, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1910),
+            id: DeclarationId(1917),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56221,7 +56443,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2575, 2591),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1911),
+            id: DeclarationId(1918),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56235,12 +56457,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2803, 2813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1912),
+            id: DeclarationId(1919),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1060),
+                    ty: DeclarationId(1067),
                 }],
             },
             type_params: vec![],
@@ -56254,12 +56476,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2818, 2865),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1913),
+            id: DeclarationId(1920),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1061),
+                    ty: DeclarationId(1068),
                 }],
             },
             type_params: vec![],
@@ -56273,7 +56495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 2870, 2921),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1914),
+            id: DeclarationId(1921),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56287,7 +56509,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3111, 3115),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1915),
+            id: DeclarationId(1922),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56301,7 +56523,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3120, 3127),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1916),
+            id: DeclarationId(1923),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56315,7 +56537,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3132, 3138),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1917),
+            id: DeclarationId(1924),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -56334,7 +56556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 3441, 3454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1918),
+            id: DeclarationId(1925),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56348,7 +56570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7082, 7093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1919),
+            id: DeclarationId(1926),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56362,7 +56584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7142, 7156),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1920),
+            id: DeclarationId(1927),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56376,7 +56598,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation.dag", 7221, 7237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1921),
+            id: DeclarationId(1928),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56390,7 +56612,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(1922),
+            id: DeclarationId(1929),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56404,7 +56626,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(1923),
+            id: DeclarationId(1930),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56418,7 +56640,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(1924),
+            id: DeclarationId(1931),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56432,7 +56654,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(1925),
+            id: DeclarationId(1932),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56446,7 +56668,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(1926),
+            id: DeclarationId(1933),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56460,7 +56682,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(1927),
+            id: DeclarationId(1934),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56474,7 +56696,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(1928),
+            id: DeclarationId(1935),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56488,7 +56710,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(1929),
+            id: DeclarationId(1936),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56502,7 +56724,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(1930),
+            id: DeclarationId(1937),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56516,7 +56738,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(1931),
+            id: DeclarationId(1938),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56530,7 +56752,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(1932),
+            id: DeclarationId(1939),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56544,7 +56766,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(1933),
+            id: DeclarationId(1940),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56558,7 +56780,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(1934),
+            id: DeclarationId(1941),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56572,7 +56794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1935),
+            id: DeclarationId(1942),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -56592,7 +56814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1936),
+            id: DeclarationId(1943),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -56612,7 +56834,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(1937),
+            id: DeclarationId(1944),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56626,7 +56848,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(1938),
+            id: DeclarationId(1945),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56640,7 +56862,243 @@ 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(1939),
+            id: DeclarationId(1946),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5402, 5406),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1947),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5409, 5415),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1948),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5418, 5420),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1949),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6236, 6240),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1950),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6243, 6247),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1951),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6250, 6254),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1952),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6257, 6262),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1953),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6265, 6276),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1954),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6279, 6292),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1955),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6872, 6877),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1956),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6880, 6889),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1957),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6892, 6898),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1958),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6901, 6905),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1959),
+            name: None,
+            connective: TypeConnective::Conj { children: vec![] },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6908, 6912),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1960),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(606),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(607),
+                    value: DeclarationId(876),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8306, 8324),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1961),
+            name: None,
+            connective: TypeConnective::Instantiation {
+                template: DeclarationId(606),
+                arguments: vec![TemplateArgument {
+                    parameter: DeclarationId(607),
+                    value: DeclarationId(877),
+                }],
+            },
+            type_params: vec![],
+            phantom_params: Vec::new(),
+            meta_tag: None,
+            specialization_parent: None,
+            inhabits: None,
+            value_body: None,
+            refinement: None,
+            nominal_opacity: None,
+            span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 8720, 8748),
+        });
+        declarations.push(Declaration {
+            id: DeclarationId(1962),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56654,7 +57112,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(1940),
+            id: DeclarationId(1963),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56668,7 +57126,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(1941),
+            id: DeclarationId(1964),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56682,7 +57140,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(1942),
+            id: DeclarationId(1965),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56696,7 +57154,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(1943),
+            id: DeclarationId(1966),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56710,7 +57168,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(1944),
+            id: DeclarationId(1967),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56724,7 +57182,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(1945),
+            id: DeclarationId(1968),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56738,7 +57196,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(1946),
+            id: DeclarationId(1969),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56752,7 +57210,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(1947),
+            id: DeclarationId(1970),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56766,7 +57224,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(1948),
+            id: DeclarationId(1971),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56780,12 +57238,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(1949),
+            id: DeclarationId(1972),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(872),
+                    ty: DeclarationId(879),
                 }],
             },
             type_params: vec![],
@@ -56799,12 +57257,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(1950),
+            id: DeclarationId(1973),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(875),
+                    ty: DeclarationId(882),
                 }],
             },
             type_params: vec![],
@@ -56818,13 +57276,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(1951),
+            id: DeclarationId(1974),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(873),
+                    value: DeclarationId(880),
                 }],
             },
             type_params: vec![],
@@ -56838,7 +57296,7 @@ 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(1952),
+            id: DeclarationId(1975),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56857,7 +57315,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(1953),
+            id: DeclarationId(1976),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56871,7 +57329,7 @@ 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(1954),
+            id: DeclarationId(1977),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -56891,7 +57349,7 @@ 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(1955),
+            id: DeclarationId(1978),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56901,7 +57359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "sites".to_string(),
-                        ty: DeclarationId(1954),
+                        ty: DeclarationId(1977),
                     },
                 ],
             },
@@ -56916,7 +57374,7 @@ 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(1956),
+            id: DeclarationId(1979),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56935,7 +57393,7 @@ 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(1957),
+            id: DeclarationId(1980),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -56954,7 +57412,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(1958),
+            id: DeclarationId(1981),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -56968,7 +57426,7 @@ 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(1959),
+            id: DeclarationId(1982),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -56997,13 +57455,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(1960),
+            id: DeclarationId(1983),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(898),
+                    value: DeclarationId(905),
                 }],
             },
             type_params: vec![],
@@ -57017,18 +57475,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(1961),
+            id: DeclarationId(1984),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(897),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(904),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(898),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(905),
                     },
                 ],
             },
@@ -57043,18 +57501,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(1962),
+            id: DeclarationId(1985),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(897),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(904),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(898),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(905),
                     },
                 ],
             },
@@ -57069,18 +57527,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(1963),
+            id: DeclarationId(1986),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(897),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(904),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(898),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(905),
                     },
                 ],
             },
@@ -57095,13 +57553,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(1964),
+            id: DeclarationId(1987),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(901),
+                    value: DeclarationId(908),
                 }],
             },
             type_params: vec![],
@@ -57115,18 +57573,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(1965),
+            id: DeclarationId(1988),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(900),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(907),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(901),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(908),
                     },
                 ],
             },
@@ -57141,18 +57599,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(1966),
+            id: DeclarationId(1989),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(900),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(907),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(901),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(908),
                     },
                 ],
             },
@@ -57167,18 +57625,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(1967),
+            id: DeclarationId(1990),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(900),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(907),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(901),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(908),
                     },
                 ],
             },
@@ -57193,13 +57651,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(1968),
+            id: DeclarationId(1991),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(904),
+                    value: DeclarationId(911),
                 }],
             },
             type_params: vec![],
@@ -57213,18 +57671,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(1969),
+            id: DeclarationId(1992),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(903),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(910),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(904),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(911),
                     },
                 ],
             },
@@ -57239,18 +57697,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(1970),
+            id: DeclarationId(1993),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(903),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(910),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(904),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(911),
                     },
                 ],
             },
@@ -57265,13 +57723,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(1971),
+            id: DeclarationId(1994),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(37),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(38),
-                    value: DeclarationId(907),
+                    value: DeclarationId(914),
                 }],
             },
             type_params: vec![],
@@ -57285,18 +57743,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(1972),
+            id: DeclarationId(1995),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(906),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(913),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(907),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(914),
                     },
                 ],
             },
@@ -57311,18 +57769,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(1973),
+            id: DeclarationId(1996),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(886),
+                template: DeclarationId(893),
                 arguments: vec![
                     TemplateArgument {
-                        parameter: DeclarationId(887),
-                        value: DeclarationId(906),
+                        parameter: DeclarationId(894),
+                        value: DeclarationId(913),
                     },
                     TemplateArgument {
-                        parameter: DeclarationId(888),
-                        value: DeclarationId(907),
+                        parameter: DeclarationId(895),
+                        value: DeclarationId(914),
                     },
                 ],
             },
@@ -57337,12 +57795,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(1974),
+            id: DeclarationId(1997),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(880),
+                    ty: DeclarationId(887),
                 }],
             },
             type_params: vec![],
@@ -57356,7 +57814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1975),
+            id: DeclarationId(1998),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57381,7 +57839,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(1976),
+            id: DeclarationId(1999),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57395,12 +57853,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(1977),
+            id: DeclarationId(2000),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "value".to_string(),
-                    ty: DeclarationId(877),
+                    ty: DeclarationId(884),
                 }],
             },
             type_params: vec![],
@@ -57414,13 +57872,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(1978),
+            id: DeclarationId(2001),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(879),
+                template: DeclarationId(886),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(880),
-                    value: DeclarationId(883),
+                    parameter: DeclarationId(887),
+                    value: DeclarationId(890),
                 }],
             },
             type_params: vec![],
@@ -57434,13 +57892,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(1979),
+            id: DeclarationId(2002),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1978),
+                    value: DeclarationId(2001),
                 }],
             },
             type_params: vec![],
@@ -57454,7 +57912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1980),
+            id: DeclarationId(2003),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57464,11 +57922,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "composed".to_string(),
-                        ty: DeclarationId(883),
+                        ty: DeclarationId(890),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1979),
+                        ty: DeclarationId(2002),
                     },
                 ],
             },
@@ -57483,13 +57941,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(1981),
+            id: DeclarationId(2004),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(877),
+                    value: DeclarationId(884),
                 }],
             },
             type_params: vec![],
@@ -57503,13 +57961,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(1982),
+            id: DeclarationId(2005),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(879),
+                template: DeclarationId(886),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(880),
-                    value: DeclarationId(883),
+                    parameter: DeclarationId(887),
+                    value: DeclarationId(890),
                 }],
             },
             type_params: vec![],
@@ -57523,13 +57981,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(1983),
+            id: DeclarationId(2006),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1982),
+                    value: DeclarationId(2005),
                 }],
             },
             type_params: vec![],
@@ -57543,7 +58001,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1984),
+            id: DeclarationId(2007),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -57553,11 +58011,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "violations".to_string(),
-                        ty: DeclarationId(1981),
+                        ty: DeclarationId(2004),
                     },
                     Field {
                         label: "witnesses".to_string(),
-                        ty: DeclarationId(1983),
+                        ty: DeclarationId(2006),
                     },
                 ],
             },
@@ -57572,13 +58030,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(1985),
+            id: DeclarationId(2008),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(879),
+                template: DeclarationId(886),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(880),
-                    value: DeclarationId(885),
+                    parameter: DeclarationId(887),
+                    value: DeclarationId(892),
                 }],
             },
             type_params: vec![],
@@ -57592,11 +58050,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(1986),
+            id: DeclarationId(2009),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(746)],
-                output: DeclarationId(1985),
+                output: DeclarationId(2008),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57610,13 +58068,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(1987),
+            id: DeclarationId(2010),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(20),
-                    value: DeclarationId(885),
+                    value: DeclarationId(892),
                 }],
             },
             type_params: vec![],
@@ -57630,11 +58088,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(1988),
+            id: DeclarationId(2011),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(746), DeclarationId(885)],
-                output: DeclarationId(881),
+                inputs: vec![DeclarationId(746), DeclarationId(892)],
+                output: DeclarationId(888),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -57648,13 +58106,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(1989),
+            id: DeclarationId(2012),
             name: Some("DimensionUnitAbelianGroup".to_string()),
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(25),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(26),
-                    value: DeclarationId(887),
+                    value: DeclarationId(894),
                 }],
             },
             type_params: vec![],
@@ -57668,13 +58126,13 @@ 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(1990),
+            id: DeclarationId(2013),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(911),
+                    value: DeclarationId(918),
                 }],
             },
             type_params: vec![],
@@ -57688,7 +58146,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(1991),
+            id: DeclarationId(2014),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57702,7 +58160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1992),
+            id: DeclarationId(2015),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57721,7 +58179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1993),
+            id: DeclarationId(2016),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57740,7 +58198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1994),
+            id: DeclarationId(2017),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -57759,13 +58217,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1995),
+            id: DeclarationId(2018),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(916),
+                    value: DeclarationId(923),
                 }],
             },
             type_params: vec![],
@@ -57779,7 +58237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1996),
+            id: DeclarationId(2019),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57793,7 +58251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1997),
+            id: DeclarationId(2020),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57807,7 +58265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1998),
+            id: DeclarationId(2021),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57821,7 +58279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(1999),
+            id: DeclarationId(2022),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57835,7 +58293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2000),
+            id: DeclarationId(2023),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57849,7 +58307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2001),
+            id: DeclarationId(2024),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57863,7 +58321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2002),
+            id: DeclarationId(2025),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57877,7 +58335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2003),
+            id: DeclarationId(2026),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57891,7 +58349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2004),
+            id: DeclarationId(2027),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57905,7 +58363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2005),
+            id: DeclarationId(2028),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57919,7 +58377,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2006),
+            id: DeclarationId(2029),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57933,7 +58391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9026, 9035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2007),
+            id: DeclarationId(2030),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57947,7 +58405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9040, 9053),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2008),
+            id: DeclarationId(2031),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57961,7 +58419,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9058, 9066),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2009),
+            id: DeclarationId(2032),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57975,7 +58433,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9071, 9081),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2010),
+            id: DeclarationId(2033),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -57989,7 +58447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9086, 9096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2011),
+            id: DeclarationId(2034),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58003,7 +58461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9101, 9112),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2012),
+            id: DeclarationId(2035),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58017,7 +58475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9117, 9125),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2013),
+            id: DeclarationId(2036),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58031,7 +58489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9130, 9137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2014),
+            id: DeclarationId(2037),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58045,7 +58503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9142, 9152),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2015),
+            id: DeclarationId(2038),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58059,7 +58517,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 9157, 9169),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2016),
+            id: DeclarationId(2039),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58073,7 +58531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11862, 11888),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2017),
+            id: DeclarationId(2040),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58087,7 +58545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 11893, 11903),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2018),
+            id: DeclarationId(2041),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58101,7 +58559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16668, 16674),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2019),
+            id: DeclarationId(2042),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58115,7 +58573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 16679, 16690),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2020),
+            id: DeclarationId(2043),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58129,7 +58587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17010, 17021),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2021),
+            id: DeclarationId(2044),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58143,7 +58601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 17026, 17037),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2022),
+            id: DeclarationId(2045),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58157,7 +58615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18970, 18981),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2023),
+            id: DeclarationId(2046),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58171,7 +58629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 18986, 18994),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2024),
+            id: DeclarationId(2047),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58190,7 +58648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20157, 20192),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2025),
+            id: DeclarationId(2048),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58215,13 +58673,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/emit_model.dag", 20197, 20285),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2026),
+            id: DeclarationId(2049),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(946),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
@@ -58235,7 +58693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2027),
+            id: DeclarationId(2050),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58254,7 +58712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 20505, 20517),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2028),
+            id: DeclarationId(2051),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58273,13 +58731,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 21890, 21905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2029),
+            id: DeclarationId(2052),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(977),
+                    value: DeclarationId(984),
                 }],
             },
             type_params: vec![],
@@ -58293,7 +58751,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27797, 27812),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2030),
+            id: DeclarationId(2053),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58312,7 +58770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 31950, 31954),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2031),
+            id: DeclarationId(2054),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58331,7 +58789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 32246, 32250),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2032),
+            id: DeclarationId(2055),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58350,7 +58808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33495, 33499),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2033),
+            id: DeclarationId(2056),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58369,7 +58827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 33970, 33974),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2034),
+            id: DeclarationId(2057),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58388,7 +58846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35233, 35237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2035),
+            id: DeclarationId(2058),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -58407,7 +58865,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 35505, 35509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2036),
+            id: DeclarationId(2059),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58421,7 +58879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5562, 5577),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2037),
+            id: DeclarationId(2060),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58435,7 +58893,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5617, 5630),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2038),
+            id: DeclarationId(2061),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58449,7 +58907,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5678, 5695),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2039),
+            id: DeclarationId(2062),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58463,7 +58921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5734, 5746),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2040),
+            id: DeclarationId(2063),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58477,13 +58935,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2041),
+            id: DeclarationId(2064),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "field".to_string(),
-                        ty: DeclarationId(961),
+                        ty: DeclarationId(968),
                     },
                     Field {
                         label: "factor".to_string(),
@@ -58502,12 +58960,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2042),
+            id: DeclarationId(2065),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "field".to_string(),
-                    ty: DeclarationId(961),
+                    ty: DeclarationId(968),
                 }],
             },
             type_params: vec![],
@@ -58521,7 +58979,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2043),
+            id: DeclarationId(2066),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58546,7 +59004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2044),
+            id: DeclarationId(2067),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58560,7 +59018,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2045),
+            id: DeclarationId(2068),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58574,7 +59032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2046),
+            id: DeclarationId(2069),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58588,12 +59046,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24082, 24096),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2047),
+            id: DeclarationId(2070),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "degree".to_string(),
-                    ty: DeclarationId(1060),
+                    ty: DeclarationId(1067),
                 }],
             },
             type_params: vec![],
@@ -58607,17 +59065,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24101, 24148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2048),
+            id: DeclarationId(2071),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "numerator".to_string(),
-                        ty: DeclarationId(1060),
+                        ty: DeclarationId(1067),
                     },
                     Field {
                         label: "root".to_string(),
-                        ty: DeclarationId(1060),
+                        ty: DeclarationId(1067),
                     },
                 ],
             },
@@ -58632,17 +59090,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24153, 24230),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2049),
+            id: DeclarationId(2072),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "base".to_string(),
-                        ty: DeclarationId(1061),
+                        ty: DeclarationId(1068),
                     },
                     Field {
                         label: "argument".to_string(),
-                        ty: DeclarationId(1060),
+                        ty: DeclarationId(1067),
                     },
                 ],
             },
@@ -58657,7 +59115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24235, 24309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2050),
+            id: DeclarationId(2073),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -58667,7 +59125,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "exponent".to_string(),
-                        ty: DeclarationId(974),
+                        ty: DeclarationId(981),
                     },
                 ],
             },
@@ -58682,7 +59140,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 24929, 24985),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2051),
+            id: DeclarationId(2074),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -58701,7 +59159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 25001, 25026),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2052),
+            id: DeclarationId(2075),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58715,12 +59173,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26675, 26688),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2053),
+            id: DeclarationId(2076),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "cost".to_string(),
-                    ty: DeclarationId(976),
+                    ty: DeclarationId(983),
                 }],
             },
             type_params: vec![],
@@ -58734,13 +59192,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26732, 26764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2054),
+            id: DeclarationId(2077),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(976),
+                    value: DeclarationId(983),
                 }],
             },
             type_params: vec![],
@@ -58754,12 +59212,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26827, 26843),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2055),
+            id: DeclarationId(2078),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "factors".to_string(),
-                    ty: DeclarationId(2054),
+                    ty: DeclarationId(2077),
                 }],
             },
             type_params: vec![],
@@ -58773,13 +59231,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26803, 26845),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2056),
+            id: DeclarationId(2079),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(976),
+                    value: DeclarationId(983),
                 }],
             },
             type_params: vec![],
@@ -58793,13 +59251,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26907, 26923),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2057),
+            id: DeclarationId(2080),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(2056),
+                    value: DeclarationId(2079),
                 }],
             },
             type_params: vec![],
@@ -58813,12 +59271,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26902, 26924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2058),
+            id: DeclarationId(2081),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2057),
+                    ty: DeclarationId(2080),
                 }],
             },
             type_params: vec![],
@@ -58832,13 +59290,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 26874, 26926),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2059),
+            id: DeclarationId(2082),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(977),
+                    value: DeclarationId(984),
                 }],
             },
             type_params: vec![],
@@ -58852,12 +59310,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27224, 27239),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2060),
+            id: DeclarationId(2083),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "terms".to_string(),
-                    ty: DeclarationId(2059),
+                    ty: DeclarationId(2082),
                 }],
             },
             type_params: vec![],
@@ -58871,7 +59329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27206, 27241),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2061),
+            id: DeclarationId(2084),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58885,7 +59343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27324, 27336),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2062),
+            id: DeclarationId(2085),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -58899,13 +59357,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/induction.dag", 27406, 27416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2063),
+            id: DeclarationId(2086),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1105),
+                    value: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -58919,13 +59377,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(2064),
+            id: DeclarationId(2087),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1105),
+                    value: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -58939,13 +59397,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(2065),
+            id: DeclarationId(2088),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(879),
+                template: DeclarationId(886),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(880),
-                    value: DeclarationId(1016),
+                    parameter: DeclarationId(887),
+                    value: DeclarationId(1023),
                 }],
             },
             type_params: vec![],
@@ -58959,11 +59417,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(2066),
+            id: DeclarationId(2089),
             name: None,
             connective: TypeConnective::Arrow {
                 inputs: vec![DeclarationId(747), DeclarationId(746)],
-                output: DeclarationId(2065),
+                output: DeclarationId(2088),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -58977,13 +59435,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(2067),
+            id: DeclarationId(2090),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(19),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(20),
-                    value: DeclarationId(1016),
+                    value: DeclarationId(1023),
                 }],
             },
             type_params: vec![],
@@ -58997,11 +59455,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(2068),
+            id: DeclarationId(2091),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1016), DeclarationId(1016)],
-                output: DeclarationId(1016),
+                inputs: vec![DeclarationId(1023), DeclarationId(1023)],
+                output: DeclarationId(1023),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -59015,11 +59473,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(2069),
+            id: DeclarationId(2092),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(1016), DeclarationId(737)],
-                output: DeclarationId(1016),
+                inputs: vec![DeclarationId(1023), DeclarationId(737)],
+                output: DeclarationId(1023),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -59033,11 +59491,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(2070),
+            id: DeclarationId(2093),
             name: None,
             connective: TypeConnective::Arrow {
-                inputs: vec![DeclarationId(747), DeclarationId(1016)],
-                output: DeclarationId(881),
+                inputs: vec![DeclarationId(747), DeclarationId(1023)],
+                output: DeclarationId(888),
                 body: ArrowBody::NoBody,
             },
             type_params: vec![],
@@ -59051,12 +59509,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(2071),
+            id: DeclarationId(2094),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(81),
                 }],
             },
@@ -59071,12 +59529,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2072),
+            id: DeclarationId(2095),
             name: None,
             connective: TypeConnective::Instantiation {
-                template: DeclarationId(1017),
+                template: DeclarationId(1024),
                 arguments: vec![TemplateArgument {
-                    parameter: DeclarationId(1018),
+                    parameter: DeclarationId(1025),
                     value: DeclarationId(81),
                 }],
             },
@@ -59091,7 +59549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2073),
+            id: DeclarationId(2096),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59105,12 +59563,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2074),
+            id: DeclarationId(2097),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1018),
+                    ty: DeclarationId(1025),
                 }],
             },
             type_params: vec![],
@@ -59124,13 +59582,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2075),
+            id: DeclarationId(2098),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(946),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
@@ -59148,7 +59606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             ),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2076),
+            id: DeclarationId(2099),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59167,13 +59625,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2077),
+            id: DeclarationId(2100),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1033),
+                    value: DeclarationId(1040),
                 }],
             },
             type_params: vec![],
@@ -59187,12 +59645,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2078),
+            id: DeclarationId(2101),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(2077),
+                    ty: DeclarationId(2100),
                 }],
             },
             type_params: vec![],
@@ -59206,7 +59664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2079),
+            id: DeclarationId(2102),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -59216,7 +59674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "payload".to_string(),
-                        ty: DeclarationId(1034),
+                        ty: DeclarationId(1041),
                     },
                 ],
             },
@@ -59231,7 +59689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2080),
+            id: DeclarationId(2103),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59250,7 +59708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2081),
+            id: DeclarationId(2104),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59269,7 +59727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2082),
+            id: DeclarationId(2105),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(109),
@@ -59280,7 +59738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(111),
-                        value: DeclarationId(1034),
+                        value: DeclarationId(1041),
                     },
                 ],
             },
@@ -59295,13 +59753,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2083),
+            id: DeclarationId(2106),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1037),
+                    value: DeclarationId(1044),
                 }],
             },
             type_params: vec![],
@@ -59315,12 +59773,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 4537, 4552),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2084),
+            id: DeclarationId(2107),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "input_order".to_string(),
-                    ty: DeclarationId(1041),
+                    ty: DeclarationId(1048),
                 }],
             },
             type_params: vec![],
@@ -59334,7 +59792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5405, 5459),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2085),
+            id: DeclarationId(2108),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59348,13 +59806,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/runtime.dag", 5724, 5733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2086),
+            id: DeclarationId(2109),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(946),
+                    value: DeclarationId(953),
                 }],
             },
             type_params: vec![],
@@ -59368,7 +59826,7 @@ 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(2087),
+            id: DeclarationId(2110),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(109),
@@ -59379,7 +59837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(111),
-                        value: DeclarationId(1048),
+                        value: DeclarationId(1055),
                     },
                 ],
             },
@@ -59394,11 +59852,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2088),
+            id: DeclarationId(2111),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1052),
+                    DeclarationId(1059),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59413,11 +59871,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2089),
+            id: DeclarationId(2112),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1052),
+                    DeclarationId(1059),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59432,11 +59890,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2090),
+            id: DeclarationId(2113),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1052),
+                    DeclarationId(1059),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59451,7 +59909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2091),
+            id: DeclarationId(2114),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(109),
@@ -59462,7 +59920,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(111),
-                        value: DeclarationId(1052),
+                        value: DeclarationId(1059),
                     },
                 ],
             },
@@ -59477,7 +59935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2092),
+            id: DeclarationId(2115),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(109),
@@ -59488,7 +59946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     TemplateArgument {
                         parameter: DeclarationId(111),
-                        value: DeclarationId(1052),
+                        value: DeclarationId(1059),
                     },
                 ],
             },
@@ -59503,11 +59961,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2093),
+            id: DeclarationId(2116),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1060),
+                    DeclarationId(1067),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59522,11 +59980,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2094),
+            id: DeclarationId(2117),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
-                    DeclarationId(1061),
+                    DeclarationId(1068),
                     CardinalityBound::AtMostOne,
                 ),
             ),
@@ -59541,7 +59999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2095),
+            id: DeclarationId(2118),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59555,7 +60013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 667, 673),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2096),
+            id: DeclarationId(2119),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59569,7 +60027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 678, 691),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2097),
+            id: DeclarationId(2120),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59583,7 +60041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 696, 710),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2098),
+            id: DeclarationId(2121),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59602,7 +60060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2099),
+            id: DeclarationId(2122),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59621,7 +60079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2100),
+            id: DeclarationId(2123),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59640,7 +60098,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2101),
+            id: DeclarationId(2124),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59659,7 +60117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2102),
+            id: DeclarationId(2125),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59678,7 +60136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2103),
+            id: DeclarationId(2126),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59692,12 +60150,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2104),
+            id: DeclarationId(2127),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "previous".to_string(),
-                    ty: DeclarationId(1060),
+                    ty: DeclarationId(1067),
                 }],
             },
             type_params: vec![],
@@ -59711,7 +60169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2105),
+            id: DeclarationId(2128),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59725,12 +60183,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2106),
+            id: DeclarationId(2129),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "inner".to_string(),
-                    ty: DeclarationId(1061),
+                    ty: DeclarationId(1068),
                 }],
             },
             type_params: vec![],
@@ -59744,7 +60202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2107),
+            id: DeclarationId(2130),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59763,12 +60221,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2108),
+            id: DeclarationId(2131),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "amount".to_string(),
-                    ty: DeclarationId(1060),
+                    ty: DeclarationId(1067),
                 }],
             },
             type_params: vec![],
@@ -59782,12 +60240,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2109),
+            id: DeclarationId(2132),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "steps".to_string(),
-                    ty: DeclarationId(1060),
+                    ty: DeclarationId(1067),
                 }],
             },
             type_params: vec![],
@@ -59801,12 +60259,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2110),
+            id: DeclarationId(2133),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "divisor".to_string(),
-                    ty: DeclarationId(1061),
+                    ty: DeclarationId(1068),
                 }],
             },
             type_params: vec![],
@@ -59820,7 +60278,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2111),
+            id: DeclarationId(2134),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59839,7 +60297,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2112),
+            id: DeclarationId(2135),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -59858,7 +60316,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2113),
+            id: DeclarationId(2136),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59872,13 +60330,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2114),
+            id: DeclarationId(2137),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1059),
+                    value: DeclarationId(1066),
                 }],
             },
             type_params: vec![],
@@ -59892,13 +60350,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2115),
+            id: DeclarationId(2138),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1052),
+                    value: DeclarationId(1059),
                 }],
             },
             type_params: vec![],
@@ -59912,7 +60370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2116),
+            id: DeclarationId(2139),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59926,7 +60384,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(2117),
+            id: DeclarationId(2140),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59940,7 +60398,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(2118),
+            id: DeclarationId(2141),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59954,7 +60412,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(2119),
+            id: DeclarationId(2142),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59968,7 +60426,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(2120),
+            id: DeclarationId(2143),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59982,7 +60440,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(2121),
+            id: DeclarationId(2144),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -59996,7 +60454,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(2122),
+            id: DeclarationId(2145),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60010,7 +60468,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(2123),
+            id: DeclarationId(2146),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60024,7 +60482,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(2124),
+            id: DeclarationId(2147),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60038,7 +60496,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(2125),
+            id: DeclarationId(2148),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60052,7 +60510,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(2126),
+            id: DeclarationId(2149),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60066,7 +60524,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(2127),
+            id: DeclarationId(2150),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60080,7 +60538,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(2128),
+            id: DeclarationId(2151),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60094,7 +60552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2129),
+            id: DeclarationId(2152),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60113,7 +60571,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2130),
+            id: DeclarationId(2153),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60132,7 +60590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 809, 820),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2131),
+            id: DeclarationId(2154),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -60151,7 +60609,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 825, 842),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2132),
+            id: DeclarationId(2155),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60165,7 +60623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 847, 849),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2133),
+            id: DeclarationId(2156),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60179,7 +60637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 854, 858),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2134),
+            id: DeclarationId(2157),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60193,7 +60651,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 863, 868),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2135),
+            id: DeclarationId(2158),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60207,7 +60665,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 873, 875),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2136),
+            id: DeclarationId(2159),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60221,7 +60679,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 880, 882),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2137),
+            id: DeclarationId(2160),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60235,7 +60693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2138),
+            id: DeclarationId(2161),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60249,7 +60707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2139),
+            id: DeclarationId(2162),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60263,7 +60721,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 905),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2140),
+            id: DeclarationId(2163),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60277,7 +60735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 910, 915),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2141),
+            id: DeclarationId(2164),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60291,7 +60749,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 920, 924),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2142),
+            id: DeclarationId(2165),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60305,7 +60763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 929, 934),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2143),
+            id: DeclarationId(2166),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60319,7 +60777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 939, 945),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2144),
+            id: DeclarationId(2167),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60333,7 +60791,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 950, 958),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2145),
+            id: DeclarationId(2168),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60347,7 +60805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 968),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2146),
+            id: DeclarationId(2169),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60361,7 +60819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 973, 978),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2147),
+            id: DeclarationId(2170),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60375,7 +60833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 983, 991),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2148),
+            id: DeclarationId(2171),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60389,7 +60847,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 996, 1005),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2149),
+            id: DeclarationId(2172),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60403,7 +60861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1013),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2150),
+            id: DeclarationId(2173),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60417,7 +60875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1018, 1024),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2151),
+            id: DeclarationId(2174),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60431,7 +60889,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1029, 1035),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2152),
+            id: DeclarationId(2175),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60445,7 +60903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1040, 1046),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2153),
+            id: DeclarationId(2176),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60459,7 +60917,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1051, 1057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2154),
+            id: DeclarationId(2177),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60473,7 +60931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1062, 1070),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2155),
+            id: DeclarationId(2178),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60487,7 +60945,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1075, 1083),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2156),
+            id: DeclarationId(2179),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60501,7 +60959,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1088, 1093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2157),
+            id: DeclarationId(2180),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60515,7 +60973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1098, 1107),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2158),
+            id: DeclarationId(2181),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60529,7 +60987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1116),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2159),
+            id: DeclarationId(2182),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60543,7 +61001,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1121, 1129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2160),
+            id: DeclarationId(2183),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60557,7 +61015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1137),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2161),
+            id: DeclarationId(2184),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60571,7 +61029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1708, 1713),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2162),
+            id: DeclarationId(2185),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60585,7 +61043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1718, 1722),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2163),
+            id: DeclarationId(2186),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60599,7 +61057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1727, 1733),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2164),
+            id: DeclarationId(2187),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60613,7 +61071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1738, 1744),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2165),
+            id: DeclarationId(2188),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60627,7 +61085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1749, 1753),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2166),
+            id: DeclarationId(2189),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60641,7 +61099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1758, 1764),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2167),
+            id: DeclarationId(2190),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60655,7 +61113,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1769, 1777),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2168),
+            id: DeclarationId(2191),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60669,7 +61127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1782, 1790),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2169),
+            id: DeclarationId(2192),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60683,7 +61141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1795, 1802),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2170),
+            id: DeclarationId(2193),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60697,7 +61155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1807, 1813),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2171),
+            id: DeclarationId(2194),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60711,7 +61169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1818, 1825),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2172),
+            id: DeclarationId(2195),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60725,7 +61183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1830, 1836),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2173),
+            id: DeclarationId(2196),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60739,7 +61197,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1848),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2174),
+            id: DeclarationId(2197),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60753,7 +61211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2288, 2290),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2175),
+            id: DeclarationId(2198),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60767,7 +61225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2295, 2299),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2176),
+            id: DeclarationId(2199),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60781,7 +61239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2304, 2309),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2177),
+            id: DeclarationId(2200),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60795,7 +61253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2314, 2316),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2178),
+            id: DeclarationId(2201),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60809,7 +61267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2321, 2323),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2179),
+            id: DeclarationId(2202),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60823,7 +61281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2328, 2330),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2180),
+            id: DeclarationId(2203),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60837,7 +61295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2335, 2337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2181),
+            id: DeclarationId(2204),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60851,7 +61309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2346),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2182),
+            id: DeclarationId(2205),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60865,7 +61323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2351, 2356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2183),
+            id: DeclarationId(2206),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60879,7 +61337,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2361, 2365),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2184),
+            id: DeclarationId(2207),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60893,7 +61351,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2375),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2185),
+            id: DeclarationId(2208),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60907,7 +61365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2380, 2386),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2186),
+            id: DeclarationId(2209),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60921,7 +61379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2391, 2399),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2187),
+            id: DeclarationId(2210),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60935,7 +61393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2409),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2188),
+            id: DeclarationId(2211),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60949,7 +61407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2414, 2419),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2189),
+            id: DeclarationId(2212),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60963,7 +61421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2424, 2432),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2190),
+            id: DeclarationId(2213),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60977,7 +61435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2437, 2446),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2191),
+            id: DeclarationId(2214),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -60991,7 +61449,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2451, 2454),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2192),
+            id: DeclarationId(2215),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61005,7 +61463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2459, 2465),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2193),
+            id: DeclarationId(2216),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61019,7 +61477,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2470, 2476),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2194),
+            id: DeclarationId(2217),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61033,7 +61491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2481, 2487),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2195),
+            id: DeclarationId(2218),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61047,7 +61505,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2492, 2498),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2196),
+            id: DeclarationId(2219),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61061,7 +61519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2503, 2511),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2197),
+            id: DeclarationId(2220),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61075,7 +61533,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2516, 2524),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2198),
+            id: DeclarationId(2221),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61089,7 +61547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2529, 2534),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2199),
+            id: DeclarationId(2222),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61103,7 +61561,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2539, 2548),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2200),
+            id: DeclarationId(2223),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61117,7 +61575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2557),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2201),
+            id: DeclarationId(2224),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61131,13 +61589,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/tokenize.dag", 2562, 2570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2202),
+            id: DeclarationId(2225),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1032),
+                    value: DeclarationId(1039),
                 }],
             },
             type_params: vec![],
@@ -61151,13 +61609,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16828, 16851),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2203),
+            id: DeclarationId(2226),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1092),
+                    value: DeclarationId(1099),
                 }],
             },
             type_params: vec![],
@@ -61171,13 +61629,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17053, 17068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2204),
+            id: DeclarationId(2227),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1094),
+                    value: DeclarationId(1101),
                 }],
             },
             type_params: vec![],
@@ -61191,7 +61649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 17073, 17093),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2205),
+            id: DeclarationId(2228),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61205,7 +61663,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(2206),
+            id: DeclarationId(2229),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61219,7 +61677,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(2207),
+            id: DeclarationId(2230),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61233,7 +61691,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(2208),
+            id: DeclarationId(2231),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61247,7 +61705,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(2209),
+            id: DeclarationId(2232),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61261,7 +61719,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(2210),
+            id: DeclarationId(2233),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61275,7 +61733,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(2211),
+            id: DeclarationId(2234),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61289,7 +61747,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(2212),
+            id: DeclarationId(2235),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61303,7 +61761,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(2213),
+            id: DeclarationId(2236),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61317,7 +61775,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(2214),
+            id: DeclarationId(2237),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61331,7 +61789,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(2215),
+            id: DeclarationId(2238),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61345,7 +61803,7 @@ 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(2216),
+            id: DeclarationId(2239),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61364,7 +61822,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(2217),
+            id: DeclarationId(2240),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61378,7 +61836,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(2218),
+            id: DeclarationId(2241),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61392,7 +61850,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(2219),
+            id: DeclarationId(2242),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61406,7 +61864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4620, 4633),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2220),
+            id: DeclarationId(2243),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61420,7 +61878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4638, 4651),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2221),
+            id: DeclarationId(2244),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61434,7 +61892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4656, 4664),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2222),
+            id: DeclarationId(2245),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -61448,12 +61906,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4689, 4697),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2223),
+            id: DeclarationId(2246),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "_0".to_string(),
-                    ty: DeclarationId(1086),
+                    ty: DeclarationId(1093),
                 }],
             },
             type_params: vec![],
@@ -61467,7 +61925,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4702, 4742),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2224),
+            id: DeclarationId(2247),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61486,7 +61944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4747, 4780),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2225),
+            id: DeclarationId(2248),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61496,7 +61954,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "state".to_string(),
-                        ty: DeclarationId(1087),
+                        ty: DeclarationId(1094),
                     },
                 ],
             },
@@ -61511,7 +61969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 4785, 4863),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2226),
+            id: DeclarationId(2249),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -61530,7 +61988,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5029, 5092),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2227),
+            id: DeclarationId(2250),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61559,21 +62017,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5097, 5188),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2228),
+            id: DeclarationId(2251),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "input_sample".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "expected_output".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -61588,17 +62046,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5193, 5325),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2229),
+            id: DeclarationId(2252),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "invariant".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -61613,7 +62071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 5540, 5629),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2230),
+            id: DeclarationId(2253),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -61633,7 +62091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6429, 6441),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2231),
+            id: DeclarationId(2254),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61643,7 +62101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2230),
+                        ty: DeclarationId(2253),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61662,7 +62120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 6378, 6475),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2232),
+            id: DeclarationId(2255),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -61682,7 +62140,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7175, 7187),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2233),
+            id: DeclarationId(2256),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -61692,7 +62150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "args".to_string(),
-                        ty: DeclarationId(2232),
+                        ty: DeclarationId(2255),
                     },
                     Field {
                         label: "expect_exit_code".to_string(),
@@ -61711,21 +62169,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7125, 7221),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2234),
+            id: DeclarationId(2257),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "expected_ref".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -61740,21 +62198,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7519, 7641),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2235),
+            id: DeclarationId(2258),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "subject_ref".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "oracle_ref".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "input_ref".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -61769,12 +62227,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 7903, 8028),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2236),
+            id: DeclarationId(2259),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
                     label: "expected".to_string(),
-                    ty: DeclarationId(1105),
+                    ty: DeclarationId(1112),
                 }],
             },
             type_params: vec![],
@@ -61788,17 +62246,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 10081, 10142),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2237),
+            id: DeclarationId(2260),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "left_report_ref".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "right_report_ref".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -61813,17 +62271,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 10709, 10821),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2238),
+            id: DeclarationId(2261),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "law".to_string(),
-                        ty: DeclarationId(1088),
+                        ty: DeclarationId(1095),
                     },
                     Field {
                         label: "lens_ref".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -61838,17 +62296,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 11417, 11496),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2239),
+            id: DeclarationId(2262),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1077),
+                        ty: DeclarationId(1084),
                     },
                     Field {
                         label: "bound".to_string(),
@@ -61867,21 +62325,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 11716, 11829),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2240),
+            id: DeclarationId(2263),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "list_constant".to_string(),
-                        ty: DeclarationId(1077),
+                        ty: DeclarationId(1084),
                     },
                     Field {
                         label: "subset_predicate".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -61896,17 +62354,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 11834, 11970),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2241),
+            id: DeclarationId(2264),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "compile_target".to_string(),
-                        ty: DeclarationId(1075),
+                        ty: DeclarationId(1082),
                     },
                     Field {
                         label: "expected".to_string(),
-                        ty: DeclarationId(1076),
+                        ty: DeclarationId(1083),
                     },
                 ],
             },
@@ -61921,17 +62379,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 11975, 12057),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2242),
+            id: DeclarationId(2265),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "ratchet_kind".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -61946,13 +62404,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12062, 12148),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2243),
+            id: DeclarationId(2266),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1075),
+                    value: DeclarationId(1082),
                 }],
             },
             type_params: vec![],
@@ -61966,17 +62424,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12227, 12237),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2244),
+            id: DeclarationId(2267),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "authority".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "generated_paths".to_string(),
-                        ty: DeclarationId(2243),
+                        ty: DeclarationId(2266),
                     },
                 ],
             },
@@ -61991,21 +62449,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 12153, 12243),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2245),
+            id: DeclarationId(2268),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -62020,21 +62478,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 13185, 13319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2246),
+            id: DeclarationId(2269),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
                     Field {
                         label: "deferred_gate".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "target_lane".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                     Field {
                         label: "authority_doc".to_string(),
-                        ty: DeclarationId(1105),
+                        ty: DeclarationId(1112),
                     },
                 ],
             },
@@ -62049,7 +62507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 13958, 14102),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2247),
+            id: DeclarationId(2270),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![Field {
@@ -62068,13 +62526,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 14947, 15001),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2248),
+            id: DeclarationId(2271),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1032),
+                    value: DeclarationId(1039),
                 }],
             },
             type_params: vec![],
@@ -62088,13 +62546,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16045, 16068),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2249),
+            id: DeclarationId(2272),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1092),
+                    value: DeclarationId(1099),
                 }],
             },
             type_params: vec![],
@@ -62108,13 +62566,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16114, 16129),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2250),
+            id: DeclarationId(2273),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1032),
+                    value: DeclarationId(1039),
                 }],
             },
             type_params: vec![],
@@ -62128,7 +62586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/std/verification.dag", 16385, 16408),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2251),
+            id: DeclarationId(2274),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
@@ -62148,7 +62606,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(2252),
+            id: DeclarationId(2275),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62162,7 +62620,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(2253),
+            id: DeclarationId(2276),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62176,7 +62634,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(2254),
+            id: DeclarationId(2277),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62190,7 +62648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2255),
+            id: DeclarationId(2278),
             name: None,
             connective: TypeConnective::Cardinality(
                 CardinalityPayload::new_unchecked_bypassing_idempotence(
@@ -62209,7 +62667,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(2256),
+            id: DeclarationId(2279),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62223,7 +62681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2257),
+            id: DeclarationId(2280),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62237,7 +62695,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2258),
+            id: DeclarationId(2281),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62251,7 +62709,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2259),
+            id: DeclarationId(2282),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62265,7 +62723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2260),
+            id: DeclarationId(2283),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62279,7 +62737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2261),
+            id: DeclarationId(2284),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62293,7 +62751,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2262),
+            id: DeclarationId(2285),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62307,7 +62765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2263),
+            id: DeclarationId(2286),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62321,7 +62779,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2264),
+            id: DeclarationId(2287),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62335,7 +62793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2265),
+            id: DeclarationId(2288),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62349,7 +62807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2266),
+            id: DeclarationId(2289),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62363,7 +62821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2267),
+            id: DeclarationId(2290),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62377,7 +62835,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2268),
+            id: DeclarationId(2291),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62391,7 +62849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2269),
+            id: DeclarationId(2292),
             name: None,
             connective: TypeConnective::Conj { children: vec![] },
             type_params: vec![],
@@ -62405,7 +62863,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2270),
+            id: DeclarationId(2293),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62415,11 +62873,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1492),
+                        ty: DeclarationId(1499),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1494),
+                        ty: DeclarationId(1501),
                     },
                     Field {
                         label: "range_min_inclusive".to_string(),
@@ -62435,7 +62893,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "overflow".to_string(),
-                        ty: DeclarationId(1495),
+                        ty: DeclarationId(1502),
                     },
                 ],
             },
@@ -62450,7 +62908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2271),
+            id: DeclarationId(2294),
             name: None,
             connective: TypeConnective::Conj {
                 children: vec![
@@ -62460,11 +62918,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
                     },
                     Field {
                         label: "algebra".to_string(),
-                        ty: DeclarationId(1493),
+                        ty: DeclarationId(1500),
                     },
                     Field {
                         label: "carrier".to_string(),
-                        ty: DeclarationId(1494),
+                        ty: DeclarationId(1501),
                     },
                     Field {
                         label: "is_copy".to_string(),
@@ -62483,13 +62941,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec<Declarat
             span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696),
         });
         declarations.push(Declaration {
-            id: DeclarationId(2272),
+            id: DeclarationId(2295),
             name: None,
             connective: TypeConnective::Instantiation {
                 template: DeclarationId(606),
                 arguments: vec![TemplateArgument {
                     parameter: DeclarationId(607),
-                    value: DeclarationId(1496),
+                    value: DeclarationId(1503),
                 }],
             },
             type_params: vec![],
@@ -62617,7 +63075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(13),
             Port {
                 id: PortId(13),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1718))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1725))),
                 produced_by: Some(NodeId(9)),
             },
         );
@@ -62641,7 +63099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(16),
             Port {
                 id: PortId(16),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1719))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1726))),
                 produced_by: None,
             },
         );
@@ -62649,7 +63107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(17),
             Port {
                 id: PortId(17),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1720))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1727))),
                 produced_by: Some(NodeId(11)),
             },
         );
@@ -62937,7 +63395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(53),
             Port {
                 id: PortId(53),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1721))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1728))),
                 produced_by: None,
             },
         );
@@ -63809,7 +64267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(162),
             Port {
                 id: PortId(162),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1722))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1729))),
                 produced_by: None,
             },
         );
@@ -63833,7 +64291,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(165),
             Port {
                 id: PortId(165),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1719))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1726))),
                 produced_by: Some(NodeId(114)),
             },
         );
@@ -63849,7 +64307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(167),
             Port {
                 id: PortId(167),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1723))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1730))),
                 produced_by: Some(NodeId(116)),
             },
         );
@@ -63857,7 +64315,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(168),
             Port {
                 id: PortId(168),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1724))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1731))),
                 produced_by: None,
             },
         );
@@ -63961,7 +64419,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(181),
             Port {
                 id: PortId(181),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1725))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1732))),
                 produced_by: Some(NodeId(129)),
             },
         );
@@ -63969,7 +64427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(182),
             Port {
                 id: PortId(182),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1726))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1733))),
                 produced_by: None,
             },
         );
@@ -64017,7 +64475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(188),
             Port {
                 id: PortId(188),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1727))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1734))),
                 produced_by: Some(NodeId(136)),
             },
         );
@@ -64025,7 +64483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(189),
             Port {
                 id: PortId(189),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1728))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1735))),
                 produced_by: None,
             },
         );
@@ -64105,7 +64563,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(199),
             Port {
                 id: PortId(199),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1729))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1736))),
                 produced_by: None,
             },
         );
@@ -64209,7 +64667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(212),
             Port {
                 id: PortId(212),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1730))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1737))),
                 produced_by: Some(NodeId(158)),
             },
         );
@@ -64489,7 +64947,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(247),
             Port {
                 id: PortId(247),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1731))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1738))),
                 produced_by: None,
             },
         );
@@ -64601,7 +65059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(261),
             Port {
                 id: PortId(261),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1732))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1739))),
                 produced_by: None,
             },
         );
@@ -64713,7 +65171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(275),
             Port {
                 id: PortId(275),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1733))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1740))),
                 produced_by: None,
             },
         );
@@ -65329,7 +65787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(352),
             Port {
                 id: PortId(352),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1734))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1741))),
                 produced_by: None,
             },
         );
@@ -65441,7 +65899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(366),
             Port {
                 id: PortId(366),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1735))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1742))),
                 produced_by: Some(NodeId(267)),
             },
         );
@@ -65449,7 +65907,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(367),
             Port {
                 id: PortId(367),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1736))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1743))),
                 produced_by: None,
             },
         );
@@ -65505,7 +65963,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(374),
             Port {
                 id: PortId(374),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1737))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1744))),
                 produced_by: Some(NodeId(274)),
             },
         );
@@ -65513,7 +65971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(375),
             Port {
                 id: PortId(375),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1738))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1745))),
                 produced_by: None,
             },
         );
@@ -65529,7 +65987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(377),
             Port {
                 id: PortId(377),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(1739))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(1746))),
                 produced_by: Some(NodeId(277)),
             },
         );
@@ -65545,7 +66003,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap<PortId, Por
             PortId(379),
             Port {
                 id: PortId(379),
-                state: PortState::Resolved(TypeShape::new(DeclarationId(2251))),
+                state: PortState::Resolved(TypeShape::new(DeclarationId(2274))),
                 produced_by: Some(NodeId(279)),
             },
         );
diff --git a/src/v3/compiler/tests/integration.rs b/src/v3/compiler/tests/integration.rs
index dfc63286fcf..61d35dfa464 100644
--- a/src/v3/compiler/tests/integration.rs
+++ b/src/v3/compiler/tests/integration.rs
@@ -51,6 +51,8 @@ mod bridge_lower_helpers_patch_zero_residual_test;
 mod canonical_lens_bridge_ratchet_test;
 #[path = "integration/cementing/cementing_lens_registry_dispatch_test.rs"]
 mod cementing_lens_registry_dispatch_test;
+#[path = "integration/cross_target_coverage_carrier_test.rs"]
+mod cross_target_coverage_carrier_test;
 #[path = "integration/e_i_lane_induction_preflight_test.rs"]
 mod e_i_lane_induction_preflight_test;
 #[path = "integration/extdeps_rust_primitives_loader_test.rs"]
diff --git a/src/v3/compiler/tests/integration/cross_target_coverage_carrier_test.rs b/src/v3/compiler/tests/integration/cross_target_coverage_carrier_test.rs
new file mode 100644
index 00000000000..335f37b6023
--- /dev/null
+++ b/src/v3/compiler/tests/integration/cross_target_coverage_carrier_test.rs
@@ -0,0 +1,259 @@
+//! **Layer:** integration
+//!
+//! Slice-active ratchet for the L6 `EmissionPathProjection` substrate
+//! carrier slice authored at `src/v3/std/cross_target_coverage.dag` per
+//! Director Option 2 RATIFIED at gunbc#828 #issuecomment-4377533390 and the
+//! worker brief
+//! `docs/briefs/r3-l6-emission-path-projection-substrate-worker.md`.
+//!
+//! **What this slice asserts (load-bearing now):**
+//!
+//! 1. The six type declarations exist with the ratified field shapes
+//!    (typed-substrate read; no string scan): `ShapeATarget`, `FormAxis`,
+//!    `BehaviorAxis`, `MethodTemplateContractKey`, `EmissionCell`,
+//!    `EmissionPathProjection`.
+//! 2. `emission_path_projections == []` — the empty-state predicate. The
+//!    slice ships with the data declaration empty by design; populated
+//!    rows are scoped to Grounding's follow-up per §4.D=(b). The empty
+//!    assertion is the slice's load-bearing claim that no row drift
+//!    sneaks in via this PR.
+//!
+//! **What this slice DEFERS (per §4.D=(b)):**
+//!
+//! Per-row key bijection between `emission_path_projections` and the union
+//! of `*_method_template_contracts` rows is the activation gate Grounding
+//! flips on in the row-population follow-up PR. The bijection scaffold
+//! lives there, not here — at HEAD `emission_path_projections: []` and the
+//! source contract lists are non-empty, so a strict bijection cannot pass
+//! while this slice ships empty. That's why the bijection check belongs
+//! in Grounding's row-population PR (#1745).
+
+use v3_compiler::dag::{Dag, Declaration, TypeConnective, ValueBody};
+use v3_compiler::generated_full_bootstrap_dag;
+
+const SHAPE_A_TARGET: &str = "ShapeATarget";
+const FORM_AXIS: &str = "FormAxis";
+const BEHAVIOR_AXIS: &str = "BehaviorAxis";
+const METHOD_TEMPLATE_CONTRACT_KEY: &str = "MethodTemplateContractKey";
+const EMISSION_CELL: &str = "EmissionCell";
+const EMISSION_PATH_PROJECTION: &str = "EmissionPathProjection";
+const EMISSION_PATH_PROJECTIONS_DATA: &str = "emission_path_projections";
+
+#[test]
+fn cross_target_coverage_six_carrier_types_present() {
+    let dag = generated_full_bootstrap_dag();
+    for name in [
+        SHAPE_A_TARGET,
+        FORM_AXIS,
+        BEHAVIOR_AXIS,
+        METHOD_TEMPLATE_CONTRACT_KEY,
+        EMISSION_CELL,
+        EMISSION_PATH_PROJECTION,
+    ] {
+        dag.declaration_by_name(name)
+            .unwrap_or_else(|| panic!("`{name}` missing from full bootstrap dag"));
+    }
+}
+
+/// Collect the structural variant labels (in declaration order) of a `Disj`
+/// declaration, panicking with a typed message if the carrier is not a `Disj`.
+fn disj_variant_labels<'a>(decl: &'a Declaration, name: &str) -> Vec<&'a str> {
+    let TypeConnective::Disj { variants } = &decl.connective else {
+        panic!("`{name}` must be `Disj`; got {:?}", decl.connective);
+    };
+    variants.iter().map(|f| f.label.as_str()).collect()
+}
+
+/// Collect the `(label, type-name)` pairs of a `Conj` declaration's children
+/// (record-type field shape), panicking with a typed message if the carrier
+/// is not a `Conj`.
+fn conj_field_label_and_type_names<'a>(
+    dag: &'a Dag,
+    decl: &'a Declaration,
+    name: &str,
+) -> Vec<(&'a str, &'a str)> {
+    let TypeConnective::Conj { children } = &decl.connective else {
+        panic!(
+            "`{name}` must be `Conj` (record); got {:?}",
+            decl.connective
+        );
+    };
+    children
+        .iter()
+        .map(|f| {
+            let ty_decl = dag.declaration(f.ty);
+            let ty_name = ty_decl.name.as_deref().unwrap_or("<anonymous>");
+            (f.label.as_str(), ty_name)
+        })
+        .collect()
+}
+
+#[test]
+fn shape_a_target_disj_variants_match_ratified_labels() {
+    let dag = generated_full_bootstrap_dag();
+    let decl = dag
+        .declaration_by_name(SHAPE_A_TARGET)
+        .expect("ShapeATarget must exist");
+    let labels = disj_variant_labels(decl, SHAPE_A_TARGET);
+    assert_eq!(
+        labels,
+        vec!["Rust", "Python", "Go"],
+        "ShapeATarget variants must be exactly [Rust, Python, Go] in declaration order \
+         (closed set per Q-Unit-1 brief §1; new target requires P1 substrate-fact-introduction)"
+    );
+}
+
+#[test]
+fn form_axis_disj_variants_match_type_connective_discriminants() {
+    let dag = generated_full_bootstrap_dag();
+    let decl = dag
+        .declaration_by_name(FORM_AXIS)
+        .expect("FormAxis must exist");
+    let labels = disj_variant_labels(decl, FORM_AXIS);
+    assert_eq!(
+        labels,
+        vec![
+            "Atom",
+            "Conj",
+            "Disj",
+            "Arrow",
+            "Cardinality",
+            "Instantiation"
+        ],
+        "FormAxis variants must mirror v3_compiler::dag::TypeConnective's six discriminants \
+         in substrate-declaration order (label-by-label parity; drift requires P1 procedure \
+         on the upstream Rust enum first)"
+    );
+}
+
+#[test]
+fn behavior_axis_disj_variants_match_behavior_discriminants() {
+    let dag = generated_full_bootstrap_dag();
+    let decl = dag
+        .declaration_by_name(BEHAVIOR_AXIS)
+        .expect("BehaviorAxis must exist");
+    let labels = disj_variant_labels(decl, BEHAVIOR_AXIS);
+    assert_eq!(
+        labels,
+        vec!["Value", "Transform", "Branch", "Loop", "Bind"],
+        "BehaviorAxis variants must mirror v3_compiler::dag::Behavior's five discriminants \
+         in L1 model order (label-by-label parity)"
+    );
+}
+
+#[test]
+fn method_template_contract_key_record_fields_match_ratified_shape() {
+    let dag = generated_full_bootstrap_dag();
+    let decl = dag
+        .declaration_by_name(METHOD_TEMPLATE_CONTRACT_KEY)
+        .expect("MethodTemplateContractKey must exist");
+    let fields = conj_field_label_and_type_names(&dag, decl, METHOD_TEMPLATE_CONTRACT_KEY);
+    assert_eq!(
+        fields,
+        vec![("target", "ShapeATarget"), ("dag_method", "MethodRef")],
+        "MethodTemplateContractKey must carry exactly {{ target: ShapeATarget, dag_method: MethodRef }} \
+         per Director Option 2 §4.C=(i) RATIFIED (typed dispatch, no string-name)"
+    );
+}
+
+#[test]
+fn emission_cell_record_fields_match_ratified_shape() {
+    let dag = generated_full_bootstrap_dag();
+    let decl = dag
+        .declaration_by_name(EMISSION_CELL)
+        .expect("EmissionCell must exist");
+    let fields = conj_field_label_and_type_names(&dag, decl, EMISSION_CELL);
+    assert_eq!(
+        fields,
+        vec![("connective", "FormAxis"), ("behavior", "BehaviorAxis")],
+        "EmissionCell must carry exactly {{ connective: FormAxis, behavior: BehaviorAxis }}"
+    );
+}
+
+#[test]
+fn emission_path_projection_record_fields_match_ratified_shape() {
+    let dag = generated_full_bootstrap_dag();
+    let decl = dag
+        .declaration_by_name(EMISSION_PATH_PROJECTION)
+        .expect("EmissionPathProjection must exist");
+    let fields = conj_field_label_and_type_names(&dag, decl, EMISSION_PATH_PROJECTION);
+    assert_eq!(
+        fields.len(),
+        2,
+        "EmissionPathProjection must have exactly two fields; got {fields:?}"
+    );
+    assert_eq!(
+        fields[0],
+        ("row_identity", "MethodTemplateContractKey"),
+        "EmissionPathProjection.row_identity must be MethodTemplateContractKey"
+    );
+    // `cells: List<EmissionCell>` lowers as a `Cardinality`-wrapped element ref.
+    // Verify the field name and that the wrapped element resolves to EmissionCell.
+    assert_eq!(
+        fields[1].0, "cells",
+        "EmissionPathProjection's second field must be `cells`"
+    );
+    let TypeConnective::Conj { children } = &decl.connective else {
+        unreachable!("already established Conj above")
+    };
+    let cells_ty_decl = dag.declaration(children[1].ty);
+    // `List<X>` lowers to a `Cardinality { element_type: X, ... }` Atom payload
+    // or to an `Instantiation` reference. Walk to find the `EmissionCell`
+    // declaration referenced by the cells field's type.
+    let cells_repr = format!("{:?}", cells_ty_decl.connective);
+    assert!(
+        cells_repr.contains("EmissionCell")
+            || cells_repr.contains("Cardinality")
+            || cells_repr.contains("Instantiation"),
+        "EmissionPathProjection.cells must resolve through `List<EmissionCell>` \
+         (Cardinality/Instantiation wrapper around EmissionCell); got {cells_repr}"
+    );
+}
+
+#[test]
+fn emission_path_projections_data_is_empty_list() {
+    let dag = generated_full_bootstrap_dag();
+    let decl = dag
+        .declaration_by_name(EMISSION_PATH_PROJECTIONS_DATA)
+        .unwrap_or_else(|| {
+            panic!(
+                "`{EMISSION_PATH_PROJECTIONS_DATA}` data declaration missing from full bootstrap dag"
+            )
+        });
+    let body = decl
+        .value_body
+        .as_ref()
+        .expect("emission_path_projections must be a `data` declaration with a value body");
+    let ValueBody::List(rows) = body else {
+        panic!(
+            "emission_path_projections must lower as `ValueBody::List` (declared as \
+             `List<EmissionPathProjection>`); got {body:?}"
+        );
+    };
+    assert!(
+        rows.is_empty(),
+        "Phase-1 carrier slice ships `emission_path_projections` EMPTY; \
+         row population is Grounding's follow-up (#1745) per §4.D=(b). \
+         Got {} row(s).",
+        rows.len()
+    );
+    // The list's declared element type must be `EmissionPathProjection`. The
+    // data declaration's `connective` records the typed list shape (e.g.,
+    // `List<EmissionPathProjection>` lowers through a Cardinality/Instantiation
+    // wrapper around the element-type DeclarationId). Walk the connective and
+    // require the EmissionPathProjection id to be transitively reachable —
+    // without this, an empty `List<Foo>` would silently pass even if the
+    // element type drifted from the ratified shape.
+    let projection_decl = dag
+        .declaration_by_name(EMISSION_PATH_PROJECTION)
+        .expect("EmissionPathProjection must exist");
+    let projection_id_token = format!("DeclarationId({})", projection_decl.id.raw());
+    let connective_repr = format!("{:?}", decl.connective);
+    assert!(
+        connective_repr.contains(&projection_id_token)
+            || connective_repr.contains("EmissionPathProjection"),
+        "emission_path_projections must be typed as `List<EmissionPathProjection>` \
+         (connective must reference EmissionPathProjection's DeclarationId or name); \
+         got connective {connective_repr}"
+    );
+}
diff --git a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
index 96bc7334c51..9327d665e94 100644
--- a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
+++ b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt
@@ -30,16 +30,17 @@ src/v3/std/anthropic_operations.dag	6	3404	a729e7662be9af5f
 src/v3/std/anthropic_schema.dag	12	54190	a430f932e3962ecb
 src/v3/std/approximate_field.dag	11	16862	d3bf5c7f2f410ce1
 src/v3/std/bin_shim.dag	4	2544	9ac96f1b3feafe47
-src/v3/std/bootstrap_authority.dag	4	64334	5bad26d70c58cc74
+src/v3/std/bootstrap_authority.dag	4	65384	b001a82f44210230
 src/v3/std/bridge_ledger.dag	7	31662	ec3b4ea8c0455eb7
 src/v3/std/clean_emission.dag	15	23867	e7bc1e6145f4781e
 src/v3/std/computation.dag	18	36754	8023f388c3fb0918
 src/v3/std/computation_model.dag	14	22953	20e458fe097d175a
+src/v3/std/cross_target_coverage.dag	9	12594	aa7fac5a10143fff
 src/v3/std/diagnostics.dag	11	21478	7d2e9e73d74e5adb
 src/v3/std/dimensions.dag	21	39170	c6833b618a39e0af
 src/v3/std/effects.dag	53	97984	1acdbeaa68acfd2e
 src/v3/std/emit_model.dag	44	82642	350e3581bbca7873
-src/v3/std/extdeps_bootstrap_fixtures.dag	4	14463	909ca7a1c1705e89
+src/v3/std/extdeps_bootstrap_fixtures.dag	4	16839	22cffc76152e82dd
 src/v3/std/go_method_template_contracts.dag	14	133273	43ccd439b5e388ea
 src/v3/std/induction.dag	56	88794	e405e1549cf2fe08
 src/v3/std/integer_diagnostic_order.dag	6	8124	5d7b31594a5b3d5c
diff --git a/src/v3/compiler/tests/integration/sg0_census_test.rs b/src/v3/compiler/tests/integration/sg0_census_test.rs
index 9f094f5741e..6257a0a2043 100644
--- a/src/v3/compiler/tests/integration/sg0_census_test.rs
+++ b/src/v3/compiler/tests/integration/sg0_census_test.rs
@@ -332,6 +332,14 @@ const EXPECTED_HAND_AUTHORED_TEST: &[&str] = &[
     "src/v3/compiler/tests/integration/common/mod.rs",
     "src/v3/compiler/tests/integration/common/r1_gates_bridge.rs",
     "src/v3/compiler/tests/integration/common/substrate_receipts.rs",
+    // R3 L6 carrier slice (PR #1842; Measure-carrier precedent at #1819,
+    // Director Option 2 RATIFIED at
+    // gunbc#828 #issuecomment-4377533390): slice-active ratchet for
+    // `cross_target_coverage.dag` (six type declarations exist;
+    // `emission_path_projections == []`). Stays hand-Rust alongside
+    // `method_template_contract_test.rs` until testgen covers
+    // reflected-Dag structural assertions over std/ row authorities.
+    "src/v3/compiler/tests/integration/cross_target_coverage_carrier_test.rs",
     "src/v3/compiler/tests/integration/e_i_lane_induction_preflight_test.rs",
     // T-Ground-Engine Phase-1 loader-close (PR #776, Director-approved
     // Path 2): hand-Rust integration test pinning
diff --git a/src/v3/std/bootstrap_authority.dag b/src/v3/std/bootstrap_authority.dag
index 5c7913ccf86..ba3e4d2c5f7 100644
--- a/src/v3/std/bootstrap_authority.dag
+++ b/src/v3/std/bootstrap_authority.dag
@@ -54,6 +54,7 @@ data bootstrap_authority: BootstrapAuthoritySet = {
     "src/v3/std/clean_emission.dag": V3StdAuthority,
     "src/v3/std/computation.dag": V3StdAuthority,
     "src/v3/std/computation_model.dag": V3StdAuthority,
+    "src/v3/std/cross_target_coverage.dag": V3StdAuthority,
     "src/v3/std/diagnostics.dag": V3StdAuthority,
     "src/v3/std/dimensions.dag": V3StdAuthority,
     "src/v3/std/effects.dag": V3StdAuthority,
diff --git a/src/v3/std/cross_target_coverage.dag b/src/v3/std/cross_target_coverage.dag
new file mode 100644
index 00000000000..30d1a5bc2bf
--- /dev/null
+++ b/src/v3/std/cross_target_coverage.dag
@@ -0,0 +1,169 @@
+// v3.std.cross_target_coverage -- L6 EmissionPathProjection substrate
+// carrier slice (R3 L6, Phase-1 carrier-only).
+//
+// Per Director Option 2 + sub-questions §4.A=(a) / §4.B=List / §4.C=(i) /
+// §4.D=(b) RATIFIED at gunbc#828 #issuecomment-4377533390 (2026-05-05).
+// Worker brief: `docs/briefs/r3-l6-emission-path-projection-substrate-worker.md`
+// (parent worktree). Routing receipt:
+// `docs/briefs/r3-substrate-l6-per-row-projection-routing-decision.md`.
+//
+// HEADER NOTE (mandatory, per brief §1):
+//   Option (c) -- a generated mirror of `v3_compiler::dag::TypeConnective`
+//   and `v3_compiler::dag::Behavior` -- is the correct dissolution target
+//   for the hand-declared `FormAxis` / `BehaviorAxis` below, once a
+//   substrate-`Disj`-mirroring generator exists. The (a) hand-declared form
+//   here is interim until that generator lands. Per Director ratification of
+//   §4.A at gunbc#828 #issuecomment-4377533390.
+//
+// SCOPE (Phase-1 carrier slice):
+//   - Six type declarations (`ShapeATarget`, `FormAxis`, `BehaviorAxis`,
+//     `MethodTemplateContractKey`, `EmissionCell`, `EmissionPathProjection`).
+//   - Empty `data emission_path_projections: List<EmissionPathProjection> = []`.
+//
+// NOT in scope (per Director §4.D=(b)):
+//   - Row population (42 Phase-1 rows of `Cardinality x Transform x <target>`)
+//     -> Grounding follow-up (#1745).
+//   - `coverage.rs` conversion from list-non-empty projection to per-row
+//     union over `emission_path_projections` -> Grounding follow-up.
+//   - Per-row key-bijection ratchet activation -> Grounding follow-up.
+//
+// CITATION DISCIPLINE (per `brief-authoring-checklist.md`): Practice 4
+// reference uses `docs/modeling-discipline.md#4-coproduct-dissolution`
+// anchor + inline rule-text quote: "Any new Rust enum with N >= 2 variants
+// must have a checkpoint comment naming its classification (🟢/🟡/🔴),
+// with a ledger entry if GREEN or a named trigger if YELLOW."
+
+module v3.std.cross_target_coverage
+
+import v3.std.methods { MethodRef }
+
+// --- ShapeATarget ---------------------------------------------------------
+//
+// PRACTICE 4 CHECKPOINT: 🟢 TERMINAL
+// Closed set of v3 target languages (Rust / Python / Go). Adding a target
+// is a substrate-scope event (new emitter, new method-template contracts),
+// NOT a row-level addition. Any new variant requires a P1 substrate-fact-
+// introduction procedure on this declaration directly; row-level addition
+// is not authorized.
+//
+// FOUR-PATTERN DISSOLUTION RECEIPT (per `feedback_coproduct_dissolution`
+// — required for 🟢 TERMINAL stamp; mirrors the DB-18 / DB-9 / DB-16
+// pattern at `docs/design-db18-workflow-effect-carrier.md` §"Dissolution
+// receipt"):
+//
+//   Pattern 1 (Fact placement — multiple consumers, different DAG
+//   locations). All three variants attach to the same `ShapeATarget`-typed
+//   slot at the same DAG location: the `target` field of
+//   `MethodTemplateContractKey` (and the `target` field of every
+//   `MethodTemplateContract` row at `{rust,python,go}_method_template_
+//   contracts.dag`). The variant discriminates WHICH TARGET LANGUAGE,
+//   not WHERE THE TARGET FACT LIVES. No fact-placement compression to
+//   dissolve. ✓ does not apply.
+//
+//   Pattern 2 (Variant-is-data — same shape, different label). The three
+//   variants have NO payload (zero-field constructors). They are pure
+//   tags, but the tag identity governs which method-template-contract
+//   list authoritatively drives Grounding emission for that target:
+//   `Rust` → `rust_method_template_contracts`, `Python` →
+//   `python_method_template_contracts`, `Go` → `go_method_template_
+//   contracts`. Each tag is a typed dispatch key into a separate
+//   substrate authority list. Collapsing to a single labeled string
+//   (e.g., `target_name: String`) would re-introduce string-name
+//   dispatch — exactly the discipline-violation Option 2's typed
+//   `target: ShapeATarget` shape was ratified to prevent (per Director
+//   §4.C=(i) RATIFIED at gunbc#828 #issuecomment-4377533390). The tag
+//   IS the dispatch authority, not redundant labeling. ✓ does not apply.
+//
+//   Pattern 3 (Algebraic-form — traces to intro/elim of algebraic
+//   structures). Target identity is not an algebraic operation: there
+//   is no `target_compose` / `target_unit` / `target_inverse` operation
+//   over `{Rust, Python, Go}`. The set is enumerated by Director
+//   ratification (Shape A target identity per `r2-grounding-manager.md`'s
+//   portability requirements), not derived from a categorical structure.
+//   ✓ does not apply.
+//
+//   Pattern 4 (Dimensional — flat enum hides M-dimensional record). The
+//   three targets do not factor into orthogonal coordinates. Target
+//   identity is not `{ paradigm: SystemsLang | Scripting,
+//   typing_discipline: Static | Dynamic, ... }` — Rust / Python / Go
+//   each carry their own irreducible portability profile (per-target
+//   primitives + per-target method-template contracts + per-target
+//   emit). A coordinate decomposition would force partial-record
+//   semantics where each dimension's meaning depends on the target
+//   tag, which is the coproduct-tag pattern in disguise. ✓ does not
+//   apply.
+//
+// Conclusion: `ShapeATarget`'s 3-variant coproduct is structurally
+// irreducible. The coproduct is the correct shape. Stamp: 🟢 TERMINAL.
+type ShapeATarget = Rust | Python | Go
+
+// --- FormAxis -------------------------------------------------------------
+//
+// PRACTICE 4 CHECKPOINT: 🟡 SCAFFOLD
+// Hand-declared mirror of `v3_compiler::dag::TypeConnective` discriminants
+// (six variants in substrate-declaration order, verified against
+// `src/v3/compiler/src/dag.rs` `pub enum TypeConnective` at this slice's
+// authoring HEAD). The cross-product walker only needs the discriminant
+// identity for L6 lookup; payloads are not mirrored.
+//
+// Dissolution trigger (per Director ratification of §4.A at
+// gunbc#828 #issuecomment-4377533390): substrate-`Disj`-mirroring generator
+// (option (c)). Generator landing retires this hand-declared form. New
+// connectives are added here only via the P1 substrate-fact-introduction
+// procedure on the upstream Rust enum first.
+type FormAxis = Atom | Conj | Disj | Arrow | Cardinality | Instantiation
+
+// --- BehaviorAxis ---------------------------------------------------------
+//
+// PRACTICE 4 CHECKPOINT: 🟡 SCAFFOLD
+// Hand-declared mirror of `v3_compiler::dag::Behavior` discriminants (five
+// variants in L1 model order, verified against `src/v3/compiler/src/dag.rs`
+// `pub enum Behavior` at this slice's authoring HEAD). The cross-product
+// walker only needs the discriminant identity; payloads are not mirrored.
+//
+// Same dissolution trigger as `FormAxis`: substrate-`Disj`-mirroring
+// generator (option (c)) per Director ratification of §4.A.
+type BehaviorAxis = Value | Transform | Branch | Loop | Bind
+
+// --- MethodTemplateContractKey -------------------------------------------
+//
+// 1:1 row-identity key for joining `EmissionPathProjection` rows back to
+// `MethodTemplateContract` source rows in
+// `{rust,python,go}_method_template_contracts.dag`. No string-name
+// dispatch; the typed `target` + `dag_method` pair is the join authority
+// (honors C2 orthogonality per Option 2).
+type MethodTemplateContractKey {
+  target: ShapeATarget
+  dag_method: MethodRef
+}
+
+// --- EmissionCell ---------------------------------------------------------
+//
+// One cell in the (FormAxis x BehaviorAxis) cross product. The L6 walker
+// enumerates all 30 (form x behavior) cells per target and reports per-cell
+// coverage; the per-row `cells` list on `EmissionPathProjection` records
+// which cells the row covers (Phase-1 rows are all single-element
+// `[{ connective: Cardinality, behavior: Transform }]`).
+type EmissionCell {
+  connective: FormAxis
+  behavior: BehaviorAxis
+}
+
+// --- EmissionPathProjection ----------------------------------------------
+//
+// Per-row projection: `row_identity` keys back to the source
+// `MethodTemplateContract` row; `cells` is the list of (form, behavior)
+// cells covered by that row's emission path. Replaces the list-non-empty
+// proxy in `coverage.rs` with a typed row-local fact.
+type EmissionPathProjection {
+  row_identity: MethodTemplateContractKey
+  cells: List<EmissionCell>
+}
+
+// --- emission_path_projections (empty data state) ------------------------
+//
+// Slice ships EMPTY. Grounding's follow-up PR (#1745) populates the 42
+// Phase-1 rows (single-element `cells: [{connective: Cardinality,
+// behavior: Transform}]` per row). The empty-state assertion is this
+// slice's load-bearing claim that no row drift sneaks in via this PR.
+data emission_path_projections: List<EmissionPathProjection> = []
diff --git a/src/v3/std/extdeps_bootstrap_fixtures.dag b/src/v3/std/extdeps_bootstrap_fixtures.dag
index 346d0111752..80ce68980b3 100644
--- a/src/v3/std/extdeps_bootstrap_fixtures.dag
+++ b/src/v3/std/extdeps_bootstrap_fixtures.dag
@@ -37,6 +37,7 @@ type BootstrapFixtureSet {
   python_method_template_contracts: BootstrapFixture
   go_method_template_contracts: BootstrapFixture
   anthropic_operations: BootstrapFixture
+  cross_target_coverage: BootstrapFixture
 }
 
 data bootstrap_fixture_authority: BootstrapFixtureSet = {
@@ -54,5 +55,8 @@ data bootstrap_fixture_authority: BootstrapFixtureSet = {
   },
   anthropic_operations: {
     virtual_path: "src/v3/std/anthropic_operations.dag"
+  },
+  cross_target_coverage: {
+    virtual_path: "src/v3/std/cross_target_coverage.dag"
   }
 }