diff --git a/dag/extdeps/ampere/mt_collins_firmware_release.dag b/dag/extdeps/ampere/mt_collins_firmware_release.dag
index 4459c588cb0..c04568dd11d 100644
--- a/dag/extdeps/ampere/mt_collins_firmware_release.dag
+++ b/dag/extdeps/ampere/mt_collins_firmware_release.dag
@@ -3,7 +3,7 @@ module extdeps.ampere.mt_collins_firmware_release
 import std.types { Int, NonEmptyStr, List }
 import std.measure { ByteSize, byte_size, Second, second }
 import extdeps.crypto.hash { sha256_digest }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.boards.types { AmpereMtCollins }
 import extdeps.firmware.types {
   FirmwareReleaseRow, FirmwareTarget, FirmwareSemanticVersion,
diff --git a/dag/extdeps/ampere/nvparam.dag b/dag/extdeps/ampere/nvparam.dag
index 80a2ed07f67..e64e33fc372 100644
--- a/dag/extdeps/ampere/nvparam.dag
+++ b/dag/extdeps/ampere/nvparam.dag
@@ -5,7 +5,7 @@ import v2.std.collection { empty_map, map_insert, map_lookup }
 import std.types { Int, List, Map, NonEmptyStr, String }
 import std.measure { ByteSize, byte_size }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Uri, Https }
 
diff --git a/dag/extdeps/ampere/ras_error_section.dag b/dag/extdeps/ampere/ras_error_section.dag
index 6dbd959daf4..eaa4e2eed16 100644
--- a/dag/extdeps/ampere/ras_error_section.dag
+++ b/dag/extdeps/ampere/ras_error_section.dag
@@ -2,7 +2,7 @@ module extdeps.ampere.ras_error_section
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Uri, Https }
 
diff --git a/dag/extdeps/ampere/smpro_internal_error.dag b/dag/extdeps/ampere/smpro_internal_error.dag
index acf193306a8..a687b4188bf 100644
--- a/dag/extdeps/ampere/smpro_internal_error.dag
+++ b/dag/extdeps/ampere/smpro_internal_error.dag
@@ -3,7 +3,7 @@ module extdeps.ampere.smpro_internal_error
 import v2.std.algebra { filter }
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Uri, Https }
 import extdeps.ampere.smpro_register { smpro_errmon_authority }
diff --git a/dag/extdeps/ampere/smpro_register.dag b/dag/extdeps/ampere/smpro_register.dag
index bdabced3df3..e55af5fe612 100644
--- a/dag/extdeps/ampere/smpro_register.dag
+++ b/dag/extdeps/ampere/smpro_register.dag
@@ -2,7 +2,7 @@ module extdeps.ampere.smpro_register
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Uri, Https }
 import extdeps.ampere.scp_diagnostic {
diff --git a/dag/extdeps/apple/info_plist.dag b/dag/extdeps/apple/info_plist.dag
index 1191ce20356..e85f1eaf157 100644
--- a/dag/extdeps/apple/info_plist.dag
+++ b/dag/extdeps/apple/info_plist.dag
@@ -1,7 +1,7 @@
 module extdeps.apple.info_plist
 
 import std.types { String, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Uri, Https }
diff --git a/dag/extdeps/automation/playwright.dag b/dag/extdeps/automation/playwright.dag
index 57cc4687d66..dd1ec0e0b01 100644
--- a/dag/extdeps/automation/playwright.dag
+++ b/dag/extdeps/automation/playwright.dag
@@ -1,7 +1,7 @@
 module extdeps.automation.playwright
 
 import std.types { NonEmptyStr, Int, List, brand }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.browser.chromium { ChromiumBuild, chromium_151_0_7922_34 }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
diff --git a/dag/extdeps/bmc/capability.dag b/dag/extdeps/bmc/capability.dag
index 60c02b8067b..8fb60119c74 100644
--- a/dag/extdeps/bmc/capability.dag
+++ b/dag/extdeps/bmc/capability.dag
@@ -9,7 +9,7 @@ import std.types { Bool, EpochMs, Int, List, NonEmptyStr, String }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
 import v2.std.algebra { any, filter, length, skip }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/bmc/ipmi.dag b/dag/extdeps/bmc/ipmi.dag
index 1546dd86933..9308d5197b0 100644
--- a/dag/extdeps/bmc/ipmi.dag
+++ b/dag/extdeps/bmc/ipmi.dag
@@ -3,7 +3,7 @@ module extdeps.bmc.ipmi
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
 import std.types { Bool, Int, NonEmptyStr, Unit }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import v2.std.algebra { filter }
 import std.resources { Network }
diff --git a/dag/extdeps/bmc/ipmi_master_write_read.dag b/dag/extdeps/bmc/ipmi_master_write_read.dag
index 487e2a42c83..e0bceeebc73 100644
--- a/dag/extdeps/bmc/ipmi_master_write_read.dag
+++ b/dag/extdeps/bmc/ipmi_master_write_read.dag
@@ -3,7 +3,7 @@ module extdeps.bmc.ipmi_master_write_read
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.algebra { trim }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Uri, Https }
 import extdeps.languages.json.parse { json_hex_nibble }
diff --git a/dag/extdeps/bmc/ipmitool_hpm_check.dag b/dag/extdeps/bmc/ipmitool_hpm_check.dag
index aec2797f2a0..9dd9dfefe19 100644
--- a/dag/extdeps/bmc/ipmitool_hpm_check.dag
+++ b/dag/extdeps/bmc/ipmitool_hpm_check.dag
@@ -2,7 +2,7 @@ module extdeps.bmc.ipmitool_hpm_check
 
 import v2.std.algebra { any, filter }
 import std.types { Bool, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
diff --git a/dag/extdeps/bmc/redfish.dag b/dag/extdeps/bmc/redfish.dag
index ee60c40487e..53b4f34790c 100644
--- a/dag/extdeps/bmc/redfish.dag
+++ b/dag/extdeps/bmc/redfish.dag
@@ -6,7 +6,7 @@ import extdeps.uri { Uri, Https }
 import extdeps.bmc.types { BmcGroundedHostObservations, BmcTelemetrySnapshot, FanTachSensor, RedfishMemorySummary, RedfishPowerControl, RedfishPowerState, RedfishPowerSubsystem, RedfishProcessorSummary, RedfishSensorReading, RedfishSystemInventory, TemperatureSensor }
 import std.measure { ByteSize, Gibibyte, HardwareThreadCount, gibibyte_to_byte_size, watt, watt_count }
 import std.types { Int, List, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
     scheme: Https
diff --git a/dag/extdeps/boards/asrock_rack.dag b/dag/extdeps/boards/asrock_rack.dag
index a8fe0d9da2a..f9691c0daa0 100644
--- a/dag/extdeps/boards/asrock_rack.dag
+++ b/dag/extdeps/boards/asrock_rack.dag
@@ -44,7 +44,7 @@ import extdeps.uri { Uri, Https }
 import extdeps.crypto.hash { Digest, sha256_digest }
 import std.nat { Nat }
 import std.types { Bool, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/clock/clock.dag b/dag/extdeps/clock/clock.dag
index bfbad15ef24..b2d7a081726 100644
--- a/dag/extdeps/clock/clock.dag
+++ b/dag/extdeps/clock/clock.dag
@@ -5,7 +5,7 @@ import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
 import std.types { EpochMs, EpochSecs, Timestamp, Unit }
 import std.nat { Nat }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
diff --git a/dag/extdeps/cloud/gcp/auth_print_access_token.dag b/dag/extdeps/cloud/gcp/auth_print_access_token.dag
index 1168c2ccad4..d48f42a0000 100644
--- a/dag/extdeps/cloud/gcp/auth_print_access_token.dag
+++ b/dag/extdeps/cloud/gcp/auth_print_access_token.dag
@@ -5,7 +5,7 @@ import std.dissolution { DissolutionCondition, unbound_dissolution }
 import std.types { List, String }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/cloud/gcp/iam.dag b/dag/extdeps/cloud/gcp/iam.dag
index 804be8b1566..2990d01a252 100644
--- a/dag/extdeps/cloud/gcp/iam.dag
+++ b/dag/extdeps/cloud/gcp/iam.dag
@@ -6,7 +6,7 @@ import extdeps.uri { Uri, Https }
 import extdeps.cloud.gcp.gcp { GcpProjectId, ServiceAccountEmail, GcpOperation }
 import std.types { Bool, Int, Json, List, NonEmptyStr, Secret, String }
 import v2.std.algebra { filter, fold_list }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import extdeps.ietf.http_semantics { GET, POST }
 import std.resources { Network }
 import extdeps.transports.rest { RestResult }
diff --git a/dag/extdeps/cloud/gcp/secret_manager.dag b/dag/extdeps/cloud/gcp/secret_manager.dag
index 9780b1c30ad..f98d082eb3a 100644
--- a/dag/extdeps/cloud/gcp/secret_manager.dag
+++ b/dag/extdeps/cloud/gcp/secret_manager.dag
@@ -8,7 +8,7 @@ import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
 import std.types { Bool, Bytes, Int, List, Map, NonEmptyStr, Secret, String, brand }
 import v2.std.algebra { fold_list, length, skip }
-import v2.std.optional { Present }
+import std.optional { Present }
 // GcpProjectId and GcpErrorShape were reached as BARE references before this
 // import existed, which resolves only when some unrelated module in the assembled
 // closure happens to have dragged their definers into the pool -- accidental
diff --git a/dag/extdeps/cloudflare/r2_lifecycle.dag b/dag/extdeps/cloudflare/r2_lifecycle.dag
index cb9bdd52856..f9bb322aa74 100644
--- a/dag/extdeps/cloudflare/r2_lifecycle.dag
+++ b/dag/extdeps/cloudflare/r2_lifecycle.dag
@@ -2,7 +2,7 @@ module extdeps.cloudflare.r2_lifecycle
 import std.resources { Network }
 
 import std.types { NonEmptyStr, List, Secret, Int, Bool, Json }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { skip }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import extdeps.uri { Uri, Https }
diff --git a/dag/extdeps/colo/types.dag b/dag/extdeps/colo/types.dag
index f6d9e709bd4..636463ca14b 100644
--- a/dag/extdeps/colo/types.dag
+++ b/dag/extdeps/colo/types.dag
@@ -1,7 +1,7 @@
 module extdeps.colo.types
 
 import std.types { NonEmptyStr, List, Bool, Int }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import std.nat { Nat }
 import std.measure {
   MoneyPerMonth, MoneyOnce, MoneyPerHour,
diff --git a/dag/extdeps/container/oci/linux.dag b/dag/extdeps/container/oci/linux.dag
index b535818f56c..22c1480a8d6 100644
--- a/dag/extdeps/container/oci/linux.dag
+++ b/dag/extdeps/container/oci/linux.dag
@@ -4,7 +4,7 @@ module extdeps.container.oci.linux
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
 import std.types { Bool, FilePath, Int, List, String }
-import v2.std.optional { Present }
+import std.optional { Present }
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
     scheme: Https
diff --git a/dag/extdeps/cpu/machine_shape.dag b/dag/extdeps/cpu/machine_shape.dag
index 5134d8338bf..8b0f3b49226 100644
--- a/dag/extdeps/cpu/machine_shape.dag
+++ b/dag/extdeps/cpu/machine_shape.dag
@@ -5,7 +5,7 @@ import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
 import extdeps.cpu.types { CpuModelCatalogRow }
 import std.machine_shape { DomainId, ExecutionDomain, LevelId, MachineShape, MachineShapeConstruction, MemoryLevel, MemoryShape, execution_shape_independent_lanes }
-import v2.std.optional { Present }
+import std.optional { Present }
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
     scheme: Https
diff --git a/dag/extdeps/docker/cli.dag b/dag/extdeps/docker/cli.dag
index 7356c564932..ad11e74a1c4 100644
--- a/dag/extdeps/docker/cli.dag
+++ b/dag/extdeps/docker/cli.dag
@@ -5,7 +5,7 @@ import extdeps.exec.program { ProgramIdentity, uncataloged_program }
 import std.types { String, Bool, List, NonEmptyStr, FilePath, Int }
 import std.nat { Nat }
 import std.measure { Second, second, second_count, ByteSize, byte_size_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
diff --git a/dag/extdeps/ethtool/ethtool.dag b/dag/extdeps/ethtool/ethtool.dag
index 7c3707c5651..909dc3409dc 100644
--- a/dag/extdeps/ethtool/ethtool.dag
+++ b/dag/extdeps/ethtool/ethtool.dag
@@ -1,7 +1,7 @@
 module extdeps.ethtool
 
 import std.types { NonEmptyStr, String, List, Bool, Unit, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
diff --git a/dag/extdeps/external_authority.dag b/dag/extdeps/external_authority.dag
index bd66b540f92..34944798f83 100644
--- a/dag/extdeps/external_authority.dag
+++ b/dag/extdeps/external_authority.dag
@@ -1,4 +1,5 @@
 module extdeps.external_authority
+import std.optional { Absent, Present }
 
 import std.types { NonEmptyStr, List }
 import std.decl_ref { DeclarationRef }
diff --git a/dag/extdeps/firmware/types.dag b/dag/extdeps/firmware/types.dag
index ddd2e30b376..b9a0f7f48d9 100644
--- a/dag/extdeps/firmware/types.dag
+++ b/dag/extdeps/firmware/types.dag
@@ -3,7 +3,7 @@ module extdeps.firmware.types
 import std.nat { Nat }
 import std.measure { ByteSize, byte_size }
 import std.types { Bool, EpochMs, NonEmptyStr, List, list_length }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.crypto.hash { Digest }
 import extdeps.boards.types { BaseboardModel }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
diff --git a/dag/extdeps/huggingface/hub.dag b/dag/extdeps/huggingface/hub.dag
index b1a80eac1a9..e73def32552 100644
--- a/dag/extdeps/huggingface/hub.dag
+++ b/dag/extdeps/huggingface/hub.dag
@@ -1,7 +1,7 @@
 module extdeps.huggingface.hub
 
 import std.types { String, Bool, List, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat }
 import std.measure { ByteSize, Gibibyte, gibibyte_ceiling }
 import extdeps.external_authority { ExternalAuthority }
diff --git a/dag/extdeps/iw/iw.dag b/dag/extdeps/iw/iw.dag
index eebc9ebb675..3a2327cf180 100644
--- a/dag/extdeps/iw/iw.dag
+++ b/dag/extdeps/iw/iw.dag
@@ -2,7 +2,7 @@ module extdeps.iw
 
 import std.types { NonEmptyStr, String, List, Int }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
diff --git a/dag/extdeps/languages/yaml/ingest.dag b/dag/extdeps/languages/yaml/ingest.dag
index 7bca1842523..c4ebf5f92d2 100644
--- a/dag/extdeps/languages/yaml/ingest.dag
+++ b/dag/extdeps/languages/yaml/ingest.dag
@@ -2,7 +2,7 @@ module extdeps.languages.yaml.ingest
 
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import extdeps.languages.yaml.types {
   YamlValue, YamlKeyValue,
diff --git a/dag/extdeps/languages/yaml/types.dag b/dag/extdeps/languages/yaml/types.dag
index e8630ac58b7..571ed868fb8 100644
--- a/dag/extdeps/languages/yaml/types.dag
+++ b/dag/extdeps/languages/yaml/types.dag
@@ -2,7 +2,7 @@ module extdeps.languages.yaml.types
 
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/linux/cgroup_v1_memory.dag b/dag/extdeps/linux/cgroup_v1_memory.dag
index 637ac10d6ff..2dced2d5916 100644
--- a/dag/extdeps/linux/cgroup_v1_memory.dag
+++ b/dag/extdeps/linux/cgroup_v1_memory.dag
@@ -9,7 +9,7 @@ import extdeps.uri { Https, Uri }
 import std.measure { ByteSize, byte_size, byte_size_count }
 import std.nat { Nat }
 import std.types { Int, NonEmptyStr, String, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/linux/cgroup_v2_memory.dag b/dag/extdeps/linux/cgroup_v2_memory.dag
index 174c4270027..e6c3d0e5265 100644
--- a/dag/extdeps/linux/cgroup_v2_memory.dag
+++ b/dag/extdeps/linux/cgroup_v2_memory.dag
@@ -10,7 +10,7 @@ import extdeps.uri { Https, Uri }
 import std.measure { ByteSize, byte_size, byte_size_count }
 import std.types { Int, NonEmptyStr, String, List }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/linux/diskstats.dag b/dag/extdeps/linux/diskstats.dag
index 5aad6b70d62..a832a81b93b 100644
--- a/dag/extdeps/linux/diskstats.dag
+++ b/dag/extdeps/linux/diskstats.dag
@@ -11,7 +11,7 @@ import std.decl_ref { DeclarationRef, WholeDeclaration }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Https, Uri }
 import extdeps.linux.kernel { LinuxKernelRelease }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // /proc/diskstats, Documentation/admin-guide/iostats.rst. The 14-field-after-name layout this
 // module reads has been stable since 2.6; later kernels APPEND discard (4.18) and flush (5.5)
diff --git a/dag/extdeps/linux/edac.dag b/dag/extdeps/linux/edac.dag
index d279b45984d..41579a598cf 100644
--- a/dag/extdeps/linux/edac.dag
+++ b/dag/extdeps/linux/edac.dag
@@ -6,7 +6,7 @@ import extdeps.linux.kernel { LinuxKernelModuleName, LinuxKernelRelease }
 import extdeps.uri { Uri, Https }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import std.measure { MemoryControllerCount, memory_controller_count, memory_controller_count_value }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.types { Bool, NonEmptyStr, Unit }
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/linux/proc_mountinfo.dag b/dag/extdeps/linux/proc_mountinfo.dag
index 96e5928e701..0c694a2f9a7 100644
--- a/dag/extdeps/linux/proc_mountinfo.dag
+++ b/dag/extdeps/linux/proc_mountinfo.dag
@@ -1,7 +1,7 @@
 module extdeps.linux.proc_mountinfo
 
 import std.types { NonEmptyStr, String, List, Bool, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
diff --git a/dag/extdeps/linux/proc_net_tcp.dag b/dag/extdeps/linux/proc_net_tcp.dag
index 779e4ca2888..f707072fbd6 100644
--- a/dag/extdeps/linux/proc_net_tcp.dag
+++ b/dag/extdeps/linux/proc_net_tcp.dag
@@ -1,7 +1,7 @@
 module extdeps.linux.proc_net_tcp
 
 import std.types { NonEmptyStr, List, Bool, Int, Port }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import v2.std.algebra { any }
 import extdeps.numeric.base16 { base16_word_value }
diff --git a/dag/extdeps/linux/proc_uptime.dag b/dag/extdeps/linux/proc_uptime.dag
index 40f9e3fc096..b2c70acf219 100644
--- a/dag/extdeps/linux/proc_uptime.dag
+++ b/dag/extdeps/linux/proc_uptime.dag
@@ -4,7 +4,7 @@ import std.types { Int, String }
 import std.nat { Nat }
 import std.measure { Millisecond, millisecond, milliseconds_per_second }
 import std.checked_arithmetic { checked_int_to_nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { skip }
 import std.decimal { decimal_digits_only }
 import extdeps.external_authority { ExternalAuthority }
diff --git a/dag/extdeps/linux/procfs.dag b/dag/extdeps/linux/procfs.dag
index c63f33a4acd..8f87cc4fc2f 100644
--- a/dag/extdeps/linux/procfs.dag
+++ b/dag/extdeps/linux/procfs.dag
@@ -2,7 +2,7 @@ module extdeps.linux.procfs
 
 import std.types { NonEmptyStr, List, Bool, Unit, Int, String }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.os.types { KernelFamily, Linux, Darwin, WindowsNt, LinuxGuestOnWindows }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Uri, Https }
diff --git a/dag/extdeps/linux/psi.dag b/dag/extdeps/linux/psi.dag
index 7c28988eb92..f928aa385d1 100644
--- a/dag/extdeps/linux/psi.dag
+++ b/dag/extdeps/linux/psi.dag
@@ -11,7 +11,7 @@ import std.decl_ref { DeclarationRef, WholeDeclaration }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Https, Uri }
 import extdeps.linux.kernel { LinuxKernelRelease }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // Pressure Stall Information, Documentation/accounting/psi.rst. The interface first shipped in
 // Linux 4.20; the per-cgroup files (memory.pressure, io.pressure, cpu.pressure) in cgroup-v2 share
diff --git a/dag/extdeps/linux/tun_fdinfo.dag b/dag/extdeps/linux/tun_fdinfo.dag
index f3d29741079..3b53f33133f 100644
--- a/dag/extdeps/linux/tun_fdinfo.dag
+++ b/dag/extdeps/linux/tun_fdinfo.dag
@@ -2,7 +2,7 @@ module extdeps.linux.tun_fdinfo
 
 import std.types { String, NonEmptyStr, Bool, Int, List }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
 import extdeps.filesystem.filesystem_io {
diff --git a/dag/extdeps/llm/claude_setup_token_cli.dag b/dag/extdeps/llm/claude_setup_token_cli.dag
index 984458bdd20..9f7d7b66ad7 100644
--- a/dag/extdeps/llm/claude_setup_token_cli.dag
+++ b/dag/extdeps/llm/claude_setup_token_cli.dag
@@ -15,7 +15,7 @@ import std.measure {
   character_count,
   measure_le,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.llm.cli { claude_cli_external_authority_anchor }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
diff --git a/dag/extdeps/network/arista_7050s_52.dag b/dag/extdeps/network/arista_7050s_52.dag
index a5e65f24211..8335a4ecb0b 100644
--- a/dag/extdeps/network/arista_7050s_52.dag
+++ b/dag/extdeps/network/arista_7050s_52.dag
@@ -22,7 +22,7 @@ import extdeps.vendor { Vendor }
 import extdeps.hardware { Hardware }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 // THE DCS-7050S-52, ARISTA'S 52-PORT 1/10GBE SFP+ SWITCH IN THE 7050 SERIES. Modelled from the
 // Arista 7050S datasheet read 2026-09-03. The canonical authority is the datasheet at
diff --git a/dag/extdeps/network/mikrotik_crs812.dag b/dag/extdeps/network/mikrotik_crs812.dag
index 78cc18dd7e4..2b8ee888cfa 100644
--- a/dag/extdeps/network/mikrotik_crs812.dag
+++ b/dag/extdeps/network/mikrotik_crs812.dag
@@ -24,7 +24,7 @@ import extdeps.vendor { Vendor }
 import extdeps.hardware { Hardware }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Absent }
+import std.optional { Absent }
 
 // THE CRS812-8DS-2DQ-2DDQ-RM, MIKROTIK'S 400G TOP-OF-RACK / LEAF SWITCH. This is the orderable
 // rack-mount product code (the "RM" suffix); MikroTik markets the family as "CRS812 DDQ".
diff --git a/dag/extdeps/network/tp_link.dag b/dag/extdeps/network/tp_link.dag
index 78810eac579..b0334e0df24 100644
--- a/dag/extdeps/network/tp_link.dag
+++ b/dag/extdeps/network/tp_link.dag
@@ -7,7 +7,7 @@ import extdeps.network.switch_types { NetworkSwitchCatalogRow, SwitchPortGroup }
 import extdeps.vendor.tp_link { tp_link }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/networkmanager/nmcli.dag b/dag/extdeps/networkmanager/nmcli.dag
index 6c8f92d164a..0493d32ce0e 100644
--- a/dag/extdeps/networkmanager/nmcli.dag
+++ b/dag/extdeps/networkmanager/nmcli.dag
@@ -2,7 +2,7 @@ module extdeps.networkmanager.nmcli
 
 import std.types { NonEmptyStr, String, List, Int, Bool }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter, list_head, list_tail, HeadFound, HeadAbsent, TailFound, TailAbsent }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
diff --git a/dag/extdeps/numeric/base16.dag b/dag/extdeps/numeric/base16.dag
index 11f2c4e82fa..4b61a28a729 100644
--- a/dag/extdeps/numeric/base16.dag
+++ b/dag/extdeps/numeric/base16.dag
@@ -4,7 +4,7 @@ import std.types { Int, String, List, Bool }
 import std.integer { QualifiedOctets, qualified_octets, qualified_octet_members }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/posix/identity.dag b/dag/extdeps/posix/identity.dag
index 79fc2da4df2..660656bd2a7 100644
--- a/dag/extdeps/posix/identity.dag
+++ b/dag/extdeps/posix/identity.dag
@@ -4,7 +4,7 @@ import std.types { String, NonEmptyStr, Int, Bool }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.integer { integer_lexeme_to_int_optional, integer_nat_to_decimal_string }
 import std.algebra { trim }
 
diff --git a/dag/extdeps/provisioning/ubuntu_seeded_install_media_remaster.dag b/dag/extdeps/provisioning/ubuntu_seeded_install_media_remaster.dag
index 1c6783bacae..133e5b6fbae 100644
--- a/dag/extdeps/provisioning/ubuntu_seeded_install_media_remaster.dag
+++ b/dag/extdeps/provisioning/ubuntu_seeded_install_media_remaster.dag
@@ -15,7 +15,7 @@ import extdeps.provisioning.ubuntu_seeded_install_media {
 import std.types { Bool, Int, List, String, NonEmptyStr }
 import std.algebra { trim }
 import std.content_hash { sha256_hex_digest }
-import v2.std.optional { Present }
+import std.optional { Present }
 import gunbc.host_command_binding {
   CommandHost, HostCommandOutcome, HostCommandDone, HostCommandFailed, HostCommandUnconfirmed, HostCommandNotDispatched,
   host_command, host_command_outcome_text, host_run, host_transport_kind,
diff --git a/dag/extdeps/realization/compile_stage_memo.dag b/dag/extdeps/realization/compile_stage_memo.dag
index 373bba165fc..6f1d761b158 100644
--- a/dag/extdeps/realization/compile_stage_memo.dag
+++ b/dag/extdeps/realization/compile_stage_memo.dag
@@ -2,7 +2,7 @@ module extdeps.realization.compile_stage_memo
 
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Absent }
+import std.optional { Absent }
 
 import extdeps.cache.types { CacheInterfaceCatalogFacts, ContentAddressed, CatalogCasContentEncoding }
 import std.cache_identity { CacheInterfaceId }
diff --git a/dag/extdeps/realization/emit_on_demand_host.dag b/dag/extdeps/realization/emit_on_demand_host.dag
index 559a9c33cc7..a5ea84fbb33 100644
--- a/dag/extdeps/realization/emit_on_demand_host.dag
+++ b/dag/extdeps/realization/emit_on_demand_host.dag
@@ -13,7 +13,7 @@ import std.content_hash {
 }
 import std.integer { NonNegativeInt }
 import std.artifact_store { ArtifactRealizationInput, artifact_realization_digest }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/realization/eval_memo.dag b/dag/extdeps/realization/eval_memo.dag
index d4c151ae335..231e3daf0f6 100644
--- a/dag/extdeps/realization/eval_memo.dag
+++ b/dag/extdeps/realization/eval_memo.dag
@@ -2,7 +2,7 @@ module extdeps.realization.eval_memo
 
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Absent }
+import std.optional { Absent }
 
 import extdeps.cache.types { CacheInterfaceCatalogFacts, ContentAddressed, CatalogCasContentEncoding }
 import std.cache_identity { CacheInterfaceId }
diff --git a/dag/extdeps/realization/hermetic_fixture.dag b/dag/extdeps/realization/hermetic_fixture.dag
index 293d7aa32ee..94b5678b57c 100644
--- a/dag/extdeps/realization/hermetic_fixture.dag
+++ b/dag/extdeps/realization/hermetic_fixture.dag
@@ -2,7 +2,7 @@ module extdeps.realization.hermetic_fixture
 
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Absent }
+import std.optional { Absent }
 
 import extdeps.cache.types { CacheInterfaceCatalogFacts, ContentAddressed, CatalogCasContentEncoding }
 import std.cache_identity { CacheInterfaceId }
diff --git a/dag/extdeps/realization/materialization_store_local.dag b/dag/extdeps/realization/materialization_store_local.dag
index 3b4cd807aec..1305ff43766 100644
--- a/dag/extdeps/realization/materialization_store_local.dag
+++ b/dag/extdeps/realization/materialization_store_local.dag
@@ -47,7 +47,7 @@ import std.cache_interface {
   ManualPurge,
   Org,
 }
-import v2.std.optional { Absent }
+import std.optional { Absent }
 import std.access { Permit, Deny }
 import std.effect_grant { Verb, Read, Write, NamespacePosition }
 import std.filesystem_path_grant { absolute_path_position }
diff --git a/dag/extdeps/realization/native_artifact_cache.dag b/dag/extdeps/realization/native_artifact_cache.dag
index 02a2a7349a0..8959616e755 100644
--- a/dag/extdeps/realization/native_artifact_cache.dag
+++ b/dag/extdeps/realization/native_artifact_cache.dag
@@ -2,7 +2,7 @@ module extdeps.realization.native_artifact_cache
 
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Absent }
+import std.optional { Absent }
 
 import extdeps.cache.types { CacheInterfaceCatalogFacts, ContentAddressed, CatalogCasContentEncoding }
 import std.cache_identity { CacheInterfaceId }
diff --git a/dag/extdeps/realization/parse_table_memo.dag b/dag/extdeps/realization/parse_table_memo.dag
index 7060fda4dc0..a7ed67f4682 100644
--- a/dag/extdeps/realization/parse_table_memo.dag
+++ b/dag/extdeps/realization/parse_table_memo.dag
@@ -2,7 +2,7 @@ module extdeps.realization.parse_table_memo
 
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Absent }
+import std.optional { Absent }
 
 import extdeps.cache.types { CacheInterfaceCatalogFacts, ContentAddressed, CatalogCasContentEncoding }
 import std.cache_identity { CacheInterfaceId }
diff --git a/dag/extdeps/realization/reconcile_in_process.dag b/dag/extdeps/realization/reconcile_in_process.dag
index 4d36782450e..e17f6b31828 100644
--- a/dag/extdeps/realization/reconcile_in_process.dag
+++ b/dag/extdeps/realization/reconcile_in_process.dag
@@ -2,7 +2,7 @@ module extdeps.realization.reconcile_in_process
 
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
-import v2.std.optional { Absent }
+import std.optional { Absent }
 
 import extdeps.cache.types {
   CacheInterfaceCatalogFacts,
diff --git a/dag/extdeps/ssh/keys.dag b/dag/extdeps/ssh/keys.dag
index 850dd408abf..23c3418d57f 100644
--- a/dag/extdeps/ssh/keys.dag
+++ b/dag/extdeps/ssh/keys.dag
@@ -5,7 +5,7 @@ import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
 import std.encoding { base64_decode_canonical, Standard }
 import v2.std.collection { list_at_optional }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
   uri: Uri {
diff --git a/dag/extdeps/standards/rfc_8118.dag b/dag/extdeps/standards/rfc_8118.dag
index 47f3fc1fca9..aab11ee616b 100644
--- a/dag/extdeps/standards/rfc_8118.dag
+++ b/dag/extdeps/standards/rfc_8118.dag
@@ -1,7 +1,7 @@
 module extdeps.standards.rfc_8118
 
 import v2.std.algebra { any }
-import v2.std.optional { Optional }
+import std.optional { Optional }
 import std.dissolution { DissolutionCondition, retires_dissolution, unbound_dissolution }
 
 import std.types { NonEmptyStr, String, List, Bool }
diff --git a/dag/extdeps/tools/jq.dag b/dag/extdeps/tools/jq.dag
index c0ce76702a6..d1f7a2c773a 100644
--- a/dag/extdeps/tools/jq.dag
+++ b/dag/extdeps/tools/jq.dag
@@ -21,7 +21,7 @@ import v2.std.diagnostic {
   outcome_rejected
 }
 import v2.std.node { Atom, Node, Symbol, TypeNode, symbol_intern_lexeme }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import std.types { FilePath }
 import extdeps.languages.json.emit { JsonValue, serialize_json }
 import extdeps.external_authority { ExternalAuthority }
diff --git a/dag/extdeps/tools/kopia.dag b/dag/extdeps/tools/kopia.dag
index dc06723b634..615997401df 100644
--- a/dag/extdeps/tools/kopia.dag
+++ b/dag/extdeps/tools/kopia.dag
@@ -3,7 +3,7 @@ module extdeps.tools.kopia
 import std.types { String, NonEmptyStr, Int, List }
 import std.algebra { Cons, Empty }
 import std.measure { ByteSize, byte_size }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import extdeps.uri { Uri, Https }
diff --git a/dag/extdeps/tools/openssl.dag b/dag/extdeps/tools/openssl.dag
index f8224a37f60..18b7fff6875 100644
--- a/dag/extdeps/tools/openssl.dag
+++ b/dag/extdeps/tools/openssl.dag
@@ -10,7 +10,7 @@ import extdeps.uri { Uri, Https }
 import extdeps.tools { CliTool, SourceApt }
 import extdeps.apt { apt_bin_dir, package_openssl }
 import extdeps.numeric.base16 { base16_decode_lower }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.algebra { trim }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
diff --git a/dag/extdeps/transports/file_declared.dag b/dag/extdeps/transports/file_declared.dag
index 88320c6d9ec..a3a4afbb48d 100644
--- a/dag/extdeps/transports/file_declared.dag
+++ b/dag/extdeps/transports/file_declared.dag
@@ -1,7 +1,7 @@
 module extdeps.transports.file_declared
 
 import std.types { String }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 // THE DECLARED VOCABULARY OF THE FILE TRANSPORT (XL-2 PR3a, moved here in PR3b-i): what an operation
 // AUTHORS for this transport -- its binding fields, the channels its `from "key"` names -- apart from
diff --git a/dag/extdeps/transports/rest.dag b/dag/extdeps/transports/rest.dag
index d5597285a3d..f4034e67c2d 100644
--- a/dag/extdeps/transports/rest.dag
+++ b/dag/extdeps/transports/rest.dag
@@ -10,7 +10,7 @@ import std.effect_grant { Envelope, HandlerBinding, Read, Write, CoveredBy, NoCo
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, UriScheme, Http, Https, Tftp, File, Ftp, Javascript, Data, Vbscript, Mailto }
 import v2.std.operation_argv { OperationRef }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import extdeps.ietf.http_semantics { HttpMethod, HttpStatusClass, GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS, CONNECT, TRACE }
 
 data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
diff --git a/dag/extdeps/transports/rest_declared.dag b/dag/extdeps/transports/rest_declared.dag
index 67c63749f6c..c8d46bb1b89 100644
--- a/dag/extdeps/transports/rest_declared.dag
+++ b/dag/extdeps/transports/rest_declared.dag
@@ -2,7 +2,7 @@ module extdeps.transports.rest_declared
 
 import std.types { HttpStatus, String }
 import extdeps.ietf.http_semantics { HttpStatusClass }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 
 // THE DECLARED VOCABULARY OF THE REST TRANSPORT (XL-2 PR3a, moved here in PR3b-i): what an operation
 // AUTHORS for this transport -- its binding fields, the channels its `from "key"` names (open: a response body member) and its response status patterns -- apart from
diff --git a/dag/extdeps/transports/shell_declared.dag b/dag/extdeps/transports/shell_declared.dag
index 236a36b9615..e103a1f3f23 100644
--- a/dag/extdeps/transports/shell_declared.dag
+++ b/dag/extdeps/transports/shell_declared.dag
@@ -1,7 +1,7 @@
 module extdeps.transports.shell_declared
 
 import std.types { Int, String }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 // THE DECLARED VOCABULARY OF THE SHELL TRANSPORT (XL-2 PR3a, moved here in PR3b-i): what an operation
 // AUTHORS for this transport -- its binding fields, the channels its `from "key"` names and its exit-status patterns -- apart from
diff --git a/dag/extdeps/uri.dag b/dag/extdeps/uri.dag
index d058412bba7..510ef86c591 100644
--- a/dag/extdeps/uri.dag
+++ b/dag/extdeps/uri.dag
@@ -1,4 +1,5 @@
 module extdeps.uri
+import std.optional { Absent, Optional, Present }
 
 import std.algebra { trim }
 
diff --git a/dag/extdeps/vllm/bench_serve.dag b/dag/extdeps/vllm/bench_serve.dag
index 47503dfcb86..e7bc2b3cd24 100644
--- a/dag/extdeps/vllm/bench_serve.dag
+++ b/dag/extdeps/vllm/bench_serve.dag
@@ -2,7 +2,7 @@ module extdeps.vllm.bench_serve
 
 import std.types { Bool, List, NonEmptyStr, String, Int }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure {
   TokenCount, token_count, token_count_value,
   Measure, Dimensionless, Milli, measure_count,
diff --git a/dag/extdeps/vllm/engram_layout.dag b/dag/extdeps/vllm/engram_layout.dag
index 54ad78a1e60..5b4738be668 100644
--- a/dag/extdeps/vllm/engram_layout.dag
+++ b/dag/extdeps/vllm/engram_layout.dag
@@ -3,7 +3,7 @@ module extdeps.vllm.engram_layout
 import std.types { Bool, List, Int, String }
 import std.nat { Nat, nat_max }
 import std.checked_arithmetic { checked_int_to_nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
 
diff --git a/dag/extdeps/vllm/kv_dtype_capability.dag b/dag/extdeps/vllm/kv_dtype_capability.dag
index e5b89ea6b5a..d7b536c83ad 100644
--- a/dag/extdeps/vllm/kv_dtype_capability.dag
+++ b/dag/extdeps/vllm/kv_dtype_capability.dag
@@ -2,7 +2,7 @@ module extdeps.vllm.kv_dtype_capability
 
 import std.types { Bool, List, NonEmptyStr, String }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.server { VllmSourceRevision, vllm_source_revision_read }
 import extdeps.vllm.source_build { vllm_deepseek_v4_1_sm12_revision }
 import extdeps.vllm.engine_args {
diff --git a/dag/extdeps/vllm/kv_group_metadata.dag b/dag/extdeps/vllm/kv_group_metadata.dag
index eec81590e90..011f7338a10 100644
--- a/dag/extdeps/vllm/kv_group_metadata.dag
+++ b/dag/extdeps/vllm/kv_group_metadata.dag
@@ -7,7 +7,7 @@ import std.measure {
   AttentionLayerCount, attention_layer_count_value,
   ByteSize, byte_size_count,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
diff --git a/dag/extdeps/vllm/kv_layout.dag b/dag/extdeps/vllm/kv_layout.dag
index e4b372cca9b..0b3f730d201 100644
--- a/dag/extdeps/vllm/kv_layout.dag
+++ b/dag/extdeps/vllm/kv_layout.dag
@@ -1,7 +1,7 @@
 module extdeps.vllm.kv_layout
 
 import std.types { Bool, String, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure {
   TokenCount, token_count, token_count_value,
   ConcurrentRequestHundredths, concurrent_request_hundredths, concurrent_request_hundredths_count,
diff --git a/dag/extdeps/vllm/weight_offload.dag b/dag/extdeps/vllm/weight_offload.dag
index b16b28188c3..0c41d2b350c 100644
--- a/dag/extdeps/vllm/weight_offload.dag
+++ b/dag/extdeps/vllm/weight_offload.dag
@@ -1,7 +1,7 @@
 module extdeps.vllm.weight_offload
 
 import std.types { String, NonEmptyStr, Bool, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import extdeps.external_authority { ExternalAuthority, ExternalModelScope, ExternalSubjectRef }
diff --git a/dag/gunbc/action_use_admission.dag b/dag/gunbc/action_use_admission.dag
index 16f97bb1344..05bbefc8282 100644
--- a/dag/gunbc/action_use_admission.dag
+++ b/dag/gunbc/action_use_admission.dag
@@ -3,7 +3,7 @@ module gunbc.action_use_admission
 import std.types { Bool, Int, List, NonEmptyStr, String, commit_sha_text_holds }
 import extdeps.github.expressions { Expression, ExpressionContext, Github, Inputs, ContextAccess, LogicalOr, LogicalAnd, interpolate, serialize_expression }
 import extdeps.external_authority { ExternalAuthority }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.languages.yaml.ingest { ingest_yaml_source, IngestedYaml, YamlIngestRejected }
 import extdeps.languages.yaml.types { YamlValue, YamlKeyValue, YamlString, YamlSequence, YamlMapping, yaml_lookup, YamlKeyPresent, YamlKeyAbsent }
 import extdeps.github.actions { Workflow, Job, Step, UsesStep, RunStep }
diff --git a/dag/gunbc/approve_ios_app.dag b/dag/gunbc/approve_ios_app.dag
index e03b490d18a..f731c0590aa 100644
--- a/dag/gunbc/approve_ios_app.dag
+++ b/dag/gunbc/approve_ios_app.dag
@@ -2,7 +2,7 @@ module gunbc.approve_ios_app
 
 import std.types { NonEmptyStr, Timestamp, Int, List }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import extdeps.apple.xcode { XcodeRelease }
 
 // THE iOS APPROVAL APP IS SWIFT, PART PRINTED FROM MODELED SYNTAX TREES AND PART HAND-AUTHORED (operator ruling: apps/approve-ios/ in
diff --git a/dag/gunbc/approve_ios_swift_protocol.dag b/dag/gunbc/approve_ios_swift_protocol.dag
index bcc69884f85..acd197d6497 100644
--- a/dag/gunbc/approve_ios_swift_protocol.dag
+++ b/dag/gunbc/approve_ios_swift_protocol.dag
@@ -2,7 +2,7 @@ module gunbc.approve_ios_swift_protocol
 
 import std.types { String, List }
 import v2.std.algebra { list_append }
-import v2.std.optional { Present }
+import std.optional { Present }
 import v2.extdeps.languages.swift.syntax {
   SwiftSourceFile, SwiftDecl, SwiftExpr, SwiftCommentedDecl, SwiftDocLineComment, SwiftLineComment,
   SwiftStaticModifier,
diff --git a/dag/gunbc/approve_ios_swift_protocol_vector_tests.dag b/dag/gunbc/approve_ios_swift_protocol_vector_tests.dag
index 30bca53340e..ed331c86ea0 100644
--- a/dag/gunbc/approve_ios_swift_protocol_vector_tests.dag
+++ b/dag/gunbc/approve_ios_swift_protocol_vector_tests.dag
@@ -2,7 +2,7 @@ module gunbc.approve_ios_swift_protocol_vector_tests
 
 import std.types { String, List, Bool }
 import v2.std.algebra { length }
-import v2.std.optional { Present }
+import std.optional { Present }
 import gunbc.auth.approval_device_redemption_fixtures { surface_vectors, SurfaceVector }
 import v2.extdeps.languages.swift.syntax {
   SwiftSourceFile, SwiftDecl, SwiftExpr, SwiftStmt, SwiftType, SwiftArgument, SwiftDeclarationModifier,
diff --git a/dag/gunbc/approve_ios_swift_wire.dag b/dag/gunbc/approve_ios_swift_wire.dag
index 70ae7866c36..918604650db 100644
--- a/dag/gunbc/approve_ios_swift_wire.dag
+++ b/dag/gunbc/approve_ios_swift_wire.dag
@@ -2,7 +2,7 @@ module gunbc.approve_ios_swift_wire
 
 import std.types { String, List, Bool, Int }
 import v2.std.algebra { list_append }
-import v2.std.optional { Present }
+import std.optional { Present }
 import v2.extdeps.languages.swift.syntax {
   SwiftSourceFile, SwiftDecl, SwiftExpr, SwiftStmt, SwiftType, SwiftArgument, SwiftCondition,
   SwiftCommentedDecl, SwiftDocLineComment, SwiftLineComment,
diff --git a/dag/gunbc/auth/approval_gate.dag b/dag/gunbc/auth/approval_gate.dag
index e18a8dbbeac..3cb5de14324 100644
--- a/dag/gunbc/auth/approval_gate.dag
+++ b/dag/gunbc/auth/approval_gate.dag
@@ -2,7 +2,7 @@ module gunbc.auth.approval_gate
 
 import std.types { String, Bool, Int, NonEmptyStr, List, Timestamp }
 import std.measure { Second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import std.scoped_authorization {
   AuthorizationRequest, ScopedAuthorization, authorize, AuthorizationPermitted, AuthorizationRefused, authorization_refusal_reason,
diff --git a/dag/gunbc/auth/approval_store_receipt.dag b/dag/gunbc/auth/approval_store_receipt.dag
index f38886c4ba1..592d9ee5a6a 100644
--- a/dag/gunbc/auth/approval_store_receipt.dag
+++ b/dag/gunbc/auth/approval_store_receipt.dag
@@ -2,7 +2,7 @@ module gunbc.auth.approval_store_receipt
 
 import std.types { NonEmptyStr, Timestamp, String, Int, List }
 import v2.std.algebra { skip }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.scoped_authorization { AttemptIdentity }
 import std.durable_compare_and_set { cas_generation_first }
 import extdeps.crypto.mac { MacKey, MacKeyId, MacVerification, MacVerified, mac_verify, mac_verification_reason }
diff --git a/dag/gunbc/auth/gcp_iam_converge.dag b/dag/gunbc/auth/gcp_iam_converge.dag
index 41fe9c6e3a8..ec2bdf2ab39 100644
--- a/dag/gunbc/auth/gcp_iam_converge.dag
+++ b/dag/gunbc/auth/gcp_iam_converge.dag
@@ -6,7 +6,7 @@ import std.content_hash { Sha256Digest, sha256_hex_digest, as_content_hash_crypt
 import std.bytes { bytes_octets, utf8_encode_bytes }
 import std.effect_grant { Write, NamespacePosition, ServiceOpTree }
 import std.scoped_authorization { AttemptIdentity, AuthorizationScope, AuthorizedAction, AuthorizationRequest }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.crypto.sha2 { sha256_hex }
 import extdeps.cloud.gcp.gcp { ServiceAccountEmail, wif_pool_resource }
 import extdeps.cloud.gcp.iam {
diff --git a/dag/gunbc/auth/gcp_iam_converge_federation.dag b/dag/gunbc/auth/gcp_iam_converge_federation.dag
index 598ecc0ba61..f7d6ae0d84c 100644
--- a/dag/gunbc/auth/gcp_iam_converge_federation.dag
+++ b/dag/gunbc/auth/gcp_iam_converge_federation.dag
@@ -1,7 +1,7 @@
 module gunbc.auth.gcp_iam_converge_federation
 
 import std.types { List, Map, NonEmptyStr, String }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.cloud.gcp.gcp { ServiceAccountEmail, WifPool, WifProvider, wif_provider_resource, wif_pool_resource }
 import gunbc.auth.github_gcp_federation { fleet_secrets_project_id, fleet_secrets_project_number, github_wif_issuer_uri, federated_service_account_member }
 import gunbc.auth.oidc_claim_pins { OidcClaimPin, claim_pins_attribute_condition, fleet_converge_job_claim_pins }
diff --git a/dag/gunbc/auth/gcp_iam_converge_run.dag b/dag/gunbc/auth/gcp_iam_converge_run.dag
index 2e031a61e72..1502d93a486 100644
--- a/dag/gunbc/auth/gcp_iam_converge_run.dag
+++ b/dag/gunbc/auth/gcp_iam_converge_run.dag
@@ -8,7 +8,7 @@ import std.types { Int, List, NonEmptyStr, String, Secret, Bool, Timestamp }
 import std.measure { Second, second, second_count }
 import std.process { ProcessExit, ExitSuccess, ExitFailure, exit_failure }
 import std.scoped_authorization { AttemptIdentity, AuthorizationRequest }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.decimal { decimal_digits_only }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.github.actions_environment { github_run_id_variable_name, github_run_attempt_variable_name, github_output_variable_name }
diff --git a/dag/gunbc/auth/github_app_control_plane_observe.dag b/dag/gunbc/auth/github_app_control_plane_observe.dag
index 713d7e530c6..6674c95fc9f 100644
--- a/dag/gunbc/auth/github_app_control_plane_observe.dag
+++ b/dag/gunbc/auth/github_app_control_plane_observe.dag
@@ -31,7 +31,7 @@ import gunbc.auth.github_apps {
   InstallationReadbackNotAttempted, InstallationReadbackFailed,
 }
 import gunbc.github_effect_perform { app_jwt_for, AppJwtSigned, AppJwtUnsigned }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // THE PRODUCER OF gunbc.auth.github_apps GitHubAppControlPlaneState, for a process that HOLDS the
 // App's key. Custody, registration and installation grant are read with ONE JWT signed in-process
diff --git a/dag/gunbc/auth/heal_publisher_federation.dag b/dag/gunbc/auth/heal_publisher_federation.dag
index 959ab57e251..8320d24fb44 100644
--- a/dag/gunbc/auth/heal_publisher_federation.dag
+++ b/dag/gunbc/auth/heal_publisher_federation.dag
@@ -1,7 +1,7 @@
 module gunbc.auth.heal_publisher_federation
 
 import std.types { NonEmptyStr, String, Int, List, Map, Bool }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.cloud.gcp.gcp { ServiceAccountEmail, GcpProjectId, WifPool, WifProvider, wif_provider_resource, wif_pool_resource }
 import extdeps.cloud.gcp.secret_ref { SecretRef, HashPending }
 import gunbc.auth.github_apps { gunbai_bot_app_pem_secret }
diff --git a/dag/gunbc/auth/heal_publisher_provision.dag b/dag/gunbc/auth/heal_publisher_provision.dag
index 5a4398ef227..2d72c630f6e 100644
--- a/dag/gunbc/auth/heal_publisher_provision.dag
+++ b/dag/gunbc/auth/heal_publisher_provision.dag
@@ -2,7 +2,7 @@ module gunbc.auth.heal_publisher_provision
 
 import std.process { ProcessExit, ExitSuccess, ExitFailure, exit_failure }
 import std.types { NonEmptyStr, String, Secret, List, Bool, Map }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.cloud.gcp.iam {
   GcpPolicy, GcpBinding, GcpIamBindingCell, GcpIamOwnedCellUniverse,
   GcpPolicyAlreadyConverged, GcpPolicyDeltaRequired, GcpPolicyRepresentationLossy,
diff --git a/dag/gunbc/auth/managed_host_boot_federation.dag b/dag/gunbc/auth/managed_host_boot_federation.dag
index d306a85d30b..5769d258663 100644
--- a/dag/gunbc/auth/managed_host_boot_federation.dag
+++ b/dag/gunbc/auth/managed_host_boot_federation.dag
@@ -1,7 +1,7 @@
 module gunbc.auth.managed_host_boot_federation
 
 import std.types { Bool, List, Map, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity, host_identity_eq }
 import extdeps.cloud.gcp.gcp { ServiceAccountEmail, WifProvider, wif_provider_resource, wif_pool_resource }
 import extdeps.cloud.gcp.iam { IamCondition, role_secretmanager_secret_accessor }
diff --git a/dag/gunbc/bmc_megarac_web_adapter.dag b/dag/gunbc/bmc_megarac_web_adapter.dag
index 8a8db2af9e2..b58fe10b162 100644
--- a/dag/gunbc/bmc_megarac_web_adapter.dag
+++ b/dag/gunbc/bmc_megarac_web_adapter.dag
@@ -4,7 +4,7 @@ import std.types { Bool, HttpStatus, Int, List, Map }
 import std.measure { Second, second_count }
 import v2.std.collection { empty_map, map_insert, map_lookup }
 import std.algebra { Empty, Cons }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.languages.json.emit { JsonValue, json_object, json_array, json_kv, json_int, json_bool, json_string, json_null, serialize_json }
 import extdeps.bmc.megarac {
   MegaRacLoginSession, megarac_login_session_json, megarac_services_kvm_json, megarac_kvm_websocket_path,
diff --git a/dag/gunbc/bmc_megarac_web_transport.dag b/dag/gunbc/bmc_megarac_web_transport.dag
index 13c392a4a81..d08d7eea69c 100644
--- a/dag/gunbc/bmc_megarac_web_transport.dag
+++ b/dag/gunbc/bmc_megarac_web_transport.dag
@@ -6,7 +6,7 @@ import std.measure { second }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import std.disposition { Disposition, Scaffold, SingleAuthority }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.tools.sleep { sleep_delay_seconds_second_carrier_projection }
diff --git a/dag/gunbc/bmc_model.dag b/dag/gunbc/bmc_model.dag
index 0c46980e40b..d99ffdd27dd 100644
--- a/dag/gunbc/bmc_model.dag
+++ b/dag/gunbc/bmc_model.dag
@@ -2,7 +2,7 @@ module gunbc.bmc_model
 
 import std.types { Bool, Int, List }
 import std.measure { Second, second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { any, filter }
 import extdeps.bmc.ipmi_channel { IpmiChannelNumber, IpmiUserId, IpmiUserChannelAccess, IpmiChannelPrivilegeLimit }
 import extdeps.bmc.ipmi_chassis_control {
diff --git a/dag/gunbc/build_target.dag b/dag/gunbc/build_target.dag
index 3e827766f0e..12b6c52e76a 100644
--- a/dag/gunbc/build_target.dag
+++ b/dag/gunbc/build_target.dag
@@ -30,7 +30,7 @@ import gunbc.target_binding {
   HeadsReadingDifferentialStanding,
   CompileCleanDiagnosticCensusStanding,
 }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import std.types { String, Bool, NonEmptyStr }
 import std.integer { Int }
 
diff --git a/dag/gunbc/claude_setup_token_enrollment.dag b/dag/gunbc/claude_setup_token_enrollment.dag
index c81186a3026..28ea1b6086b 100644
--- a/dag/gunbc/claude_setup_token_enrollment.dag
+++ b/dag/gunbc/claude_setup_token_enrollment.dag
@@ -4,7 +4,7 @@ import std.types { String, NonEmptyStr, Int, Bool, List, FilePath, list_length }
 import std.measure { CharacterCount, character_count }
 import std.disposition { Disposition, Scaffold, SingleAuthority }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.llm.claude_setup_token_cli {
   ClaudeSetupTokenFormatObservation,
   SetupTokenFormatUnobserved,
diff --git a/dag/gunbc/clock_read.dag b/dag/gunbc/clock_read.dag
index 5fcd355a08e..0c4bacc595c 100644
--- a/dag/gunbc/clock_read.dag
+++ b/dag/gunbc/clock_read.dag
@@ -3,7 +3,7 @@ module gunbc.clock_read
 import std.types { Bool, EpochMs, String, NonEmptyStr }
 import std.decl_ref { decl_ref }
 import extdeps.clock { Clock, ClockUnixMillisObserved, ClockUnixMillisRefused, clock_unix_millis_read }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 fn clock_now_probed_at() -> NonEmptyStr? {
   let result = Clock.Now()
diff --git a/dag/gunbc/cloudflare/r2_staged_transfer.dag b/dag/gunbc/cloudflare/r2_staged_transfer.dag
index 79e0d14c7d3..e88267ab050 100644
--- a/dag/gunbc/cloudflare/r2_staged_transfer.dag
+++ b/dag/gunbc/cloudflare/r2_staged_transfer.dag
@@ -10,7 +10,7 @@ import extdeps.exec.command { LocalExec }
 import extdeps.transports.rest { mutation_status_is_commit_ambiguous }
 import extdeps.tools.curl { curl_sigv4_s3_upload_command, curl_sigv4_s3_download_command, curl_aws_sigv4_cli_tool, curl_s3_entity_tag_cli_tool, S3TransferReport, ReportStatus, ReportStatusAndEntityTag }
 import extdeps.object_storage { ObjectEntityTag, ObjectPutPrecondition, PutUnconditional, PutIfAbsent, PutIfMatch }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.host_cli_dependency {
   observe_host_cli_dependency,
   HostCliDependencyPresent,
diff --git a/dag/gunbc/colo_census_coverage.dag b/dag/gunbc/colo_census_coverage.dag
index 504958d61a4..5f19feed81e 100644
--- a/dag/gunbc/colo_census_coverage.dag
+++ b/dag/gunbc/colo_census_coverage.dag
@@ -66,7 +66,7 @@ import extdeps.colo.netrality { netrality_401_n_broad, netrality_401_n_broad_den
 import extdeps.colo.lumen { lumen_newark_165_halsey, lumen_jersey_city, lumen_weehawken, lumen_cabinet_density }
 import extdeps.colo.telehouse { telehouse_chelsea, telehouse_chelsea_density, telehouse_teleport, telehouse_teleport_density }
 import extdeps.colo.sabey { sabey_375_pearl, sabey_375_pearl_density }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 
 // WHERE WE LOOKED AND FOUND NOTHING, WHICH IS A MEASUREMENT AND NOT AN ABSENCE.
 //
diff --git a/dag/gunbc/compile_census_probe.dag b/dag/gunbc/compile_census_probe.dag
index 4f485bae3c3..ec4f155cce7 100644
--- a/dag/gunbc/compile_census_probe.dag
+++ b/dag/gunbc/compile_census_probe.dag
@@ -1,7 +1,7 @@
 module gunbc.compile_census_probe
 
 import std.types { Bool, Int, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus, CensusObserved, CensusNotRunnable, census_blocking_rows, census_total_count }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_subject, census_any_count_for_class, census_blocking_count_for_class }
 
diff --git a/dag/gunbc/contributor_onboarding_path.dag b/dag/gunbc/contributor_onboarding_path.dag
index cdc83535f43..fcd643dd75f 100644
--- a/dag/gunbc/contributor_onboarding_path.dag
+++ b/dag/gunbc/contributor_onboarding_path.dag
@@ -2,7 +2,7 @@ module gunbc.contributor_onboarding_path
 
 import std.types { String, List, NonEmptyStr }
 import v2.std.integer { integer_int_to_decimal_string }
-import v2.std.optional { Optional, Absent, Present }
+import std.optional { Optional, Absent, Present }
 import std.markdown { MarkdownDocument, MarkdownBlock }
 import gunbc.plans.md_helpers { h1, h2, h3, p, li, ul, ol, hr }
 import extdeps.languages.markdown { serialize_markdown_source }
diff --git a/dag/gunbc/declared_import_closure_binding.dag b/dag/gunbc/declared_import_closure_binding.dag
index 67f5a5d4c26..a478155c999 100644
--- a/dag/gunbc/declared_import_closure_binding.dag
+++ b/dag/gunbc/declared_import_closure_binding.dag
@@ -1,7 +1,7 @@
 module gunbc.declared_import_closure_binding
 
 import std.types { String, NonEmptyStr, Bool, Int, List }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import gunbc.compile_clean_diagnostic_policy { UnlistedImportBindingSource, ListedImport, PoolCoincidence }
 
 // THE CLASS B OBSERVATION SURFACE for declared-import-closure binding (#6985). Host twin of
diff --git a/dag/gunbc/discovery_census.dag b/dag/gunbc/discovery_census.dag
index db78d95bd91..bd4bdacd1cc 100644
--- a/dag/gunbc/discovery_census.dag
+++ b/dag/gunbc/discovery_census.dag
@@ -17,7 +17,7 @@ import v2.workflow.required_floor {
   required_floor_site_disposition,
 }
 import v2.std.live_tree { LiveTreeDisposition }
-import v2.std.optional { Optional, Absent, Present, optional_absent, optional_present }
+import std.optional { Optional, Absent, Present, optional_absent, optional_present }
 import std.types { String, Bool }
 import std.integer { Int }
 
diff --git a/dag/gunbc/dispatch_selection.dag b/dag/gunbc/dispatch_selection.dag
index 2a2d20a59bd..05b966fcedf 100644
--- a/dag/gunbc/dispatch_selection.dag
+++ b/dag/gunbc/dispatch_selection.dag
@@ -1,7 +1,7 @@
 module gunbc.dispatch_selection
 
 import std.types { String, NonEmptyStr, Int, Bool, List, FilePath, list_length }
-import v2.std.optional { optional_absent, optional_present }
+import std.optional { optional_absent, optional_present }
 import extdeps.llm.cli {
   ProviderModelSelection,
   ProviderAccountDefaultModel,
diff --git a/dag/gunbc/doc_graph_roots.dag b/dag/gunbc/doc_graph_roots.dag
index b12300acb68..b618eda42ec 100644
--- a/dag/gunbc/doc_graph_roots.dag
+++ b/dag/gunbc/doc_graph_roots.dag
@@ -996,7 +996,7 @@ data hand_authored_doc_bind_incomings: List<HandAuthoredDocBind> = [
     primary_work: DeclarationRef { module_path: "v2.std.node", decl_name: "Symbol", field: WholeDeclaration },
     additional_works: [
       DeclarationRef { module_path: "std.algebra", decl_name: "FreeMonoid", field: WholeDeclaration },
-      DeclarationRef { module_path: "v2.std.optional", decl_name: "Optional", field: WholeDeclaration },
+      DeclarationRef { module_path: "std.optional", decl_name: "Optional", field: WholeDeclaration },
     ],
     dissolution: PlanRetiresWhen { condition: unbound_dissolution(description: "the work this document plans lands and its subject Symbol describes shipped behavior rather than a planned change; the row deletes with the document. Registered at subject grain: the systems bound here are the ones whose movement would make this document's purpose false, not every system its prose mentions.") },
   },
diff --git a/dag/gunbc/fabric/durable_cas_fabric_storage.dag b/dag/gunbc/fabric/durable_cas_fabric_storage.dag
index 8d7762f2f6b..7cabe1e8bc2 100644
--- a/dag/gunbc/fabric/durable_cas_fabric_storage.dag
+++ b/dag/gunbc/fabric/durable_cas_fabric_storage.dag
@@ -2,7 +2,7 @@ module gunbc.durable_cas_fabric_storage
 
 import std.types { String, Bool, Int, NonEmptyStr, List }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash, serialize_content_hash, parse_content_hash }
 import std.durable_compare_and_set {
   CasGeneration, CasExpectation, ExpectSlotAbsent, ExpectSlotGeneration,
diff --git a/dag/gunbc/fabric/fabric_blob_shell.dag b/dag/gunbc/fabric/fabric_blob_shell.dag
index fccdff82910..d7ebc3dcc24 100644
--- a/dag/gunbc/fabric/fabric_blob_shell.dag
+++ b/dag/gunbc/fabric/fabric_blob_shell.dag
@@ -2,7 +2,7 @@ module gunbc.fabric.fabric_blob_shell
 
 import std.types { String, NonEmptyStr, List, Bool }
 import v2.std.node { Node }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.diagnostic { Outcome }
 import v2.workflow.bash_emit { bash_emit_stmts }
 import v2.extdeps.languages.bash_build {
diff --git a/dag/gunbc/fabric/fabric_cell_acquire.dag b/dag/gunbc/fabric/fabric_cell_acquire.dag
index 398c3f54596..694c4d2bef2 100644
--- a/dag/gunbc/fabric/fabric_cell_acquire.dag
+++ b/dag/gunbc/fabric/fabric_cell_acquire.dag
@@ -3,7 +3,7 @@ module gunbc.fabric_cell_acquire
 import std.types { String, List, Bool, NonEmptyStr }
 import std.algebra { trim }
 import std.disposition { ConstructionMechanism, SingleAuthority }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.tools.stat
diff --git a/dag/gunbc/fabric/fabric_cell_converge.dag b/dag/gunbc/fabric/fabric_cell_converge.dag
index a7052cd946a..f1bb9f67170 100644
--- a/dag/gunbc/fabric/fabric_cell_converge.dag
+++ b/dag/gunbc/fabric/fabric_cell_converge.dag
@@ -3,7 +3,7 @@ module gunbc.fabric_cell_converge
 import std.types { String, List, Bool, Int, NonEmptyStr, list_length }
 import std.nat { Nat }
 import std.disposition { ConstructionMechanism, SingleAuthority }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import std.measure { byte_size_count }
 import extdeps.systemd {
   systemd_cpu_quota_per_sec_of_threads,
diff --git a/dag/gunbc/fabric/fabric_cell_host_root.dag b/dag/gunbc/fabric/fabric_cell_host_root.dag
index e74cb6e1845..89872c3eff0 100644
--- a/dag/gunbc/fabric/fabric_cell_host_root.dag
+++ b/dag/gunbc/fabric/fabric_cell_host_root.dag
@@ -2,7 +2,7 @@ module gunbc.fabric_cell_host_root
 
 import std.types { String, List, Bool, Int, NonEmptyStr, list_length }
 import std.disposition { ConstructionMechanism, SingleAuthority }
-import v2.std.optional { Optional, Present }
+import std.optional { Optional, Present }
 import product.host_identity { HostIdentity }
 import gunbc.ownership { Ownership, Owned, Ensured }
 import gunbc.build_cache_instance { RunnerSlotIdentity }
diff --git a/dag/gunbc/fabric/fabric_event_log_host.dag b/dag/gunbc/fabric/fabric_event_log_host.dag
index 8762cf0b503..ef6ef92a0e7 100644
--- a/dag/gunbc/fabric/fabric_event_log_host.dag
+++ b/dag/gunbc/fabric/fabric_event_log_host.dag
@@ -7,7 +7,7 @@ import product.host_identity { HostIdentity }
 import gunbc.roadmap_dashboard_instance { HostDashboardInstance, DashboardInstanceByHost, DashboardInstanceForHost, DashboardInstanceHostUnknown, dashboard_instance_for_host }
 import gunbc.fabric_event_log { event_log_binding_for }
 import gunbc.fabric_storage_client { FabricStorageBinding }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 // WHERE THE EVENT LOG IS FROM THE EXECUTING HOST'S POINT OF VIEW: the dashboard instance declared
 // for the host supplies the identity the fabric DB binding is derived against -- in process on the
diff --git a/dag/gunbc/fabric/fabric_object_r2.dag b/dag/gunbc/fabric/fabric_object_r2.dag
index f1bcdc60d60..0904ebb9888 100644
--- a/dag/gunbc/fabric/fabric_object_r2.dag
+++ b/dag/gunbc/fabric/fabric_object_r2.dag
@@ -1,7 +1,7 @@
 module gunbc.fabric.fabric_object_r2
 
 import std.types { String, NonEmptyStr, Bool, FilePath }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.durable_compare_and_set { CasGenerationPublicationRefused }
 import std.fabric_storage {
   FabricObject, FabricObjectRef, fabric_object_addressed,
diff --git a/dag/gunbc/fabric/fabric_required_build_cell.dag b/dag/gunbc/fabric/fabric_required_build_cell.dag
index 8c9b019f1b1..6c7f90e12bd 100644
--- a/dag/gunbc/fabric/fabric_required_build_cell.dag
+++ b/dag/gunbc/fabric/fabric_required_build_cell.dag
@@ -27,7 +27,7 @@ import gunbc.fabric_cell_converge {
   FabricCellMember, FabricCellRootAddress, FabricCellAttemptRootAddress, FabricCellResourceBoundaryAddress,
   fabric_cell_id_for_slot, fabric_cell_member_key, fabric_cell_member_ownership, fabric_cell_resource_address_equal,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.posix.identity { PosixOwnerSpec }
 
 // Mode is intentionally a separate coordinate from owner/group. FCI-1 has a production owner/group
diff --git a/dag/gunbc/fabric/fabric_storage_r2_head.dag b/dag/gunbc/fabric/fabric_storage_r2_head.dag
index 2c03b83eed3..8b97d6a38fb 100644
--- a/dag/gunbc/fabric/fabric_storage_r2_head.dag
+++ b/dag/gunbc/fabric/fabric_storage_r2_head.dag
@@ -1,7 +1,7 @@
 module gunbc.fabric_storage_r2_head
 
 import std.types { String, NonEmptyStr, Int, Bool, List, FilePath }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import std.durable_compare_and_set {
   CasGeneration, cas_generation_first, cas_generation_successor, CasSuccessorGeneration, CasSuccessorExhausted,
diff --git a/dag/gunbc/fabric/fabric_store_operation_admission.dag b/dag/gunbc/fabric/fabric_store_operation_admission.dag
index 7b0dda30780..b2a50ba4a23 100644
--- a/dag/gunbc/fabric/fabric_store_operation_admission.dag
+++ b/dag/gunbc/fabric/fabric_store_operation_admission.dag
@@ -1,7 +1,7 @@
 module gunbc.fabric_store_operation_admission
 
 import std.types { NonEmptyStr, String, Bool, Timestamp, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { is_empty }
 import std.content_hash { ContentHash, sha256_hex_digest, as_content_hash_cryptographic, parse_content_hash, compare_content_hash, ContentHashEqual, ContentHashDifferent, ContentHashCrossFamilyIncomparable }
 import std.effect_grant { Grant, Write, NamespacePosition, CodeNameTree, grant_covers }
diff --git a/dag/gunbc/fabric/fci1_bounded_execution_context.dag b/dag/gunbc/fabric/fci1_bounded_execution_context.dag
index 490cc2c1f66..f440af74fe0 100644
--- a/dag/gunbc/fabric/fci1_bounded_execution_context.dag
+++ b/dag/gunbc/fabric/fci1_bounded_execution_context.dag
@@ -7,7 +7,7 @@ import std.measure {
 }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import gunbc.runner_slot_desired { gunbc_runner_slot_desired }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 // This is the bound for the instrument process roots, not a claim that the driver is a runner
 // slot. The basis names why the values may be reused: the driver performs sequential gunbc
diff --git a/dag/gunbc/fabric/fci1_bounded_execution_context_emit.dag b/dag/gunbc/fabric/fci1_bounded_execution_context_emit.dag
index 44b1e05c300..4f88ba7d2a9 100644
--- a/dag/gunbc/fabric/fci1_bounded_execution_context_emit.dag
+++ b/dag/gunbc/fabric/fci1_bounded_execution_context_emit.dag
@@ -9,7 +9,7 @@ import gunbc.fci1_bounded_execution_context {
   Fci1MemoryHighExceedsMax,
   fci1_bounded_execution_context,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.systemd { WorkingDirectoryProperty, RuntimeDirectoryProperty, MemoryMax, MemoryHigh, systemd_unit_property_wire }
 
 type Fci1BoundedExecutionContextEmission
diff --git a/dag/gunbc/fabric/workspace_checkpoint_instrument.dag b/dag/gunbc/fabric/workspace_checkpoint_instrument.dag
index 9de00a4e4d0..26834bbad79 100644
--- a/dag/gunbc/fabric/workspace_checkpoint_instrument.dag
+++ b/dag/gunbc/fabric/workspace_checkpoint_instrument.dag
@@ -1,7 +1,7 @@
 module gunbc.fabric.workspace_checkpoint_instrument
 
 import std.types { String, NonEmptyStr, Int, Bool, List, FilePath, Map }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { Cons, Empty, MapIntroductionEntry, map_from_entries }
 import std.process { ProcessExit, ExitSuccess, ExitFailure, exit_failure }
 import std.measure { ByteSize, byte_size, measure_count, ObservationInstant, ProcessMonotonic, WallClock, Nanosecond, nanosecond, nanosecond_count }
diff --git a/dag/gunbc/fabric/workspace_source.dag b/dag/gunbc/fabric/workspace_source.dag
index ad12792924c..ee02a550ef0 100644
--- a/dag/gunbc/fabric/workspace_source.dag
+++ b/dag/gunbc/fabric/workspace_source.dag
@@ -1,7 +1,7 @@
 module gunbc.fabric.workspace_source
 
 import std.types { String, NonEmptyStr, Int, Bool, List, FilePath }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { Cons, Empty }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.measure { ByteSize, byte_size, measure_count, nanosecond, nanosecond_count, ObservationInstant, ProcessMonotonic, WallClock }
diff --git a/dag/gunbc/fleet/fleet_converge_plan_manifest.dag b/dag/gunbc/fleet/fleet_converge_plan_manifest.dag
index d2a3943fb4b..3d04e6e68be 100644
--- a/dag/gunbc/fleet/fleet_converge_plan_manifest.dag
+++ b/dag/gunbc/fleet/fleet_converge_plan_manifest.dag
@@ -4,7 +4,7 @@ import gunbc.fleet_converge_scope { FleetConvergeScope }
 
 import std.types { String, Bool, Int, NonEmptyStr, List }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.fleet_converge_receipt { FleetConvergePlanReceipt }
 import gunbc.fleet_converge_plan {
   ScopeDecoded,
diff --git a/dag/gunbc/fleet/fleet_desired_admission_workflow.dag b/dag/gunbc/fleet/fleet_desired_admission_workflow.dag
index 4b6e244c433..48edde80c97 100644
--- a/dag/gunbc/fleet/fleet_desired_admission_workflow.dag
+++ b/dag/gunbc/fleet/fleet_desired_admission_workflow.dag
@@ -37,7 +37,7 @@ import gunbc.fleet_desired_admission {
   fleet_desired_admission_event_payload_path,
   fleet_desired_admission_authorized_action_path,
 }
-import v2.std.optional { Present }
+import std.optional { Present }
 import std.types { String, List }
 
 // THIS WORKFLOW IS THE ADMISSION GATE'S TRIGGER, AND IT IS SEPARATE FROM THE DEPLOY WORKFLOW
diff --git a/dag/gunbc/fleet/fleet_release_bins_key.dag b/dag/gunbc/fleet/fleet_release_bins_key.dag
index f11c43787f8..02d45e4aa8f 100644
--- a/dag/gunbc/fleet/fleet_release_bins_key.dag
+++ b/dag/gunbc/fleet/fleet_release_bins_key.dag
@@ -6,7 +6,7 @@ import v2.std.node { Node }
 import v2.std.diagnostic { Outcome, Accepted, Rejected, outcome_accepted }
 import v2.workflow.bash_emit { bash_emit_stmts }
 import extdeps.shell.exec { TransportScript, transport_script_seal }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { Empty }
 import extdeps.tools.jq {
   JqInvocation, JqProgram, JqInputFile, JqRawOutput, JqLastResultExit, JqAdmittedProcessPlan,
diff --git a/dag/gunbc/fleet/fleet_wireless_link.dag b/dag/gunbc/fleet/fleet_wireless_link.dag
index e42553fb11d..0a6ee4abb0f 100644
--- a/dag/gunbc/fleet/fleet_wireless_link.dag
+++ b/dag/gunbc/fleet/fleet_wireless_link.dag
@@ -2,7 +2,7 @@ module gunbc.fleet_wireless_link
 
 import std.types { String, Bool, Int, List, NonEmptyStr }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import std.upsert_decision { UpsertDecision, Noop, Apply, Refuse }
 import product.host_identity { HostIdentity, host_identity_eq }
diff --git a/dag/gunbc/fleet/fleet_wireless_link_converge.dag b/dag/gunbc/fleet/fleet_wireless_link_converge.dag
index 7d29e057e39..813b8c6975c 100644
--- a/dag/gunbc/fleet/fleet_wireless_link_converge.dag
+++ b/dag/gunbc/fleet/fleet_wireless_link_converge.dag
@@ -2,7 +2,7 @@ module gunbc.fleet_wireless_link_converge
 
 import std.types { String, Bool, NonEmptyStr, Secret }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import gunbc.clock_read { clock_now_probed_at, probed_at_word }
 import gunbc.fleet_known_hosts_anchor {
diff --git a/dag/gunbc/fleet/mtcollins_firmware_baseline.dag b/dag/gunbc/fleet/mtcollins_firmware_baseline.dag
index 80f2a3d544a..5f409ba68fa 100644
--- a/dag/gunbc/fleet/mtcollins_firmware_baseline.dag
+++ b/dag/gunbc/fleet/mtcollins_firmware_baseline.dag
@@ -15,7 +15,7 @@ import std.decision {
   CandidateFieldUnestablished, NoFeasibleRealization, SelectionNeedsEvidence, SelectionNeedsPolicy, RealizationSelectionRefused,
   select_realization,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.external_authority { CitedToAuthority }
 import extdeps.firmware.types {
   FirmwareReleaseRow, FirmwareTarget, FirmwareSemanticVersion,
diff --git a/dag/gunbc/fleet/mtcollins_firmware_converge.dag b/dag/gunbc/fleet/mtcollins_firmware_converge.dag
index 89a8f41c52d..88c1a74c961 100644
--- a/dag/gunbc/fleet/mtcollins_firmware_converge.dag
+++ b/dag/gunbc/fleet/mtcollins_firmware_converge.dag
@@ -8,7 +8,7 @@ import std.upsert_decision { UpsertDecision, Noop, Apply, Refuse }
 import std.realization_reconcile { Applied, classify_reconciled, EffectConverged, EffectNotConverged }
 import std.decision { SelectionReceipt }
 import std.human_intervention { HumanIntervention, DeviceOnce, DischargedAt }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.crypto.hash { Digest }
 import extdeps.standards.picmg_hpm1 {
   HpmUpgradeOutcome, HpmUpgradeCompleted, HpmUpgradeFailed, HpmUpgradeStage,
diff --git a/dag/gunbc/gcp/gcp_estate_adoption.dag b/dag/gunbc/gcp/gcp_estate_adoption.dag
index c7bd7297ae6..b9963c95452 100644
--- a/dag/gunbc/gcp/gcp_estate_adoption.dag
+++ b/dag/gunbc/gcp/gcp_estate_adoption.dag
@@ -1,7 +1,7 @@
 module gunbc.gcp_estate_adoption
 
 import std.types { String, NonEmptyStr, List, Bool }
-import v2.std.optional { Present }
+import std.optional { Present }
 import std.upsert_decision {
   UpsertClassification,
   Converged,
diff --git a/dag/gunbc/gcp/gcp_estate_dependency.dag b/dag/gunbc/gcp/gcp_estate_dependency.dag
index bdbc54c955a..d72da751ee2 100644
--- a/dag/gunbc/gcp/gcp_estate_dependency.dag
+++ b/dag/gunbc/gcp/gcp_estate_dependency.dag
@@ -1,7 +1,7 @@
 module gunbc.gcp_estate_dependency
 
 import std.types { String, NonEmptyStr, List, Bool, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.cloud.gcp.gcp { ServiceAccountEmail }
 import gunbc.gcp_estate_observation {
   GcpEstateCensus,
diff --git a/dag/gunbc/gcp/gcp_estate_observation.dag b/dag/gunbc/gcp/gcp_estate_observation.dag
index 02d8c217d33..90e72f8c2a6 100644
--- a/dag/gunbc/gcp/gcp_estate_observation.dag
+++ b/dag/gunbc/gcp/gcp_estate_observation.dag
@@ -1,7 +1,7 @@
 module gunbc.gcp_estate_observation
 
 import std.types { String, NonEmptyStr, List, Bool, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.cloud.gcp.gcp {
   GcpProjectId,
   GcpProject,
diff --git a/dag/gunbc/generated_artifact_observation.dag b/dag/gunbc/generated_artifact_observation.dag
index 3a6b36dbe93..bc1a531b532 100644
--- a/dag/gunbc/generated_artifact_observation.dag
+++ b/dag/gunbc/generated_artifact_observation.dag
@@ -20,7 +20,7 @@ import gunbc.generated_artifact_assessment {
   GeneratedArtifactObservation, GeneratedArtifactObserved, GeneratedArtifactCommittedAbsent, GeneratedArtifactObservationRefused
 }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data live_tree_disposition: LiveTreeDisposition = ReadsLiveTree
 
diff --git a/dag/gunbc/generated_workflow_provenance.dag b/dag/gunbc/generated_workflow_provenance.dag
index 4827e248c07..fde3d36ef3f 100644
--- a/dag/gunbc/generated_workflow_provenance.dag
+++ b/dag/gunbc/generated_workflow_provenance.dag
@@ -3,7 +3,7 @@ module gunbc.generated_workflow_provenance
 import std.types { String, List }
 import gunbc.generated_artifact { GeneratedArtifact, WitnessFloorYamlArtifact, FleetConvergeYamlArtifact, FleetDesiredAdmissionYamlArtifact, MicrovmShakedownYamlArtifact, InstrumentDispatchYamlArtifact, HealWorkflowYamlArtifact, HealPublisherWorkflowYamlArtifact }
 import gunbc.generated_artifact_registry { generated_artifact_registry }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // A generated workflow is reviewed at the bytes boundary, where its producing .dag graph is not
 // visible. Keep the provenance in that boundary rather than asking a reviewer to infer it from the
diff --git a/dag/gunbc/github_effect_perform.dag b/dag/gunbc/github_effect_perform.dag
index 61d97a11cbb..565bc4b9f86 100644
--- a/dag/gunbc/github_effect_perform.dag
+++ b/dag/gunbc/github_effect_perform.dag
@@ -35,7 +35,7 @@ import gunbc.runner.runner_jit_perform {
   JitMintDispatch, JitMintDispatchAuthorized, JitMintDispatchRefused,
   JitCredentialDelivery, JitCredentialNotDispatched, receive_jit_mint,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // THE HOME OF A PERFORMED GitHubEffect. extdeps.github.effect is the effect SHAPE; the services in
 // extdeps.github.* are REST realizations bound to it (gunbc#10923); this module is the workflow
diff --git a/dag/gunbc/guarantee_probe_corpus.dag b/dag/gunbc/guarantee_probe_corpus.dag
index 67b4ed040f8..834caf191f9 100644
--- a/dag/gunbc/guarantee_probe_corpus.dag
+++ b/dag/gunbc/guarantee_probe_corpus.dag
@@ -25,7 +25,7 @@ import gunbc.guarantee_measurement {
   join_receipt_to_path, ReceiptJoined, ReceiptPathUnknown, ReceiptPathDuplicate,
   MeasurementAnchor,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.diagnostic { Diagnostics, None, Some, NonEmptyDiagnostics }
 import v2.std.algebra { fold_list }
 import v2.std.node { Symbol, Node, content_hash }
diff --git a/dag/gunbc/harness/harness_backend.dag b/dag/gunbc/harness/harness_backend.dag
index 6c80e481f37..e000aa53412 100644
--- a/dag/gunbc/harness/harness_backend.dag
+++ b/dag/gunbc/harness/harness_backend.dag
@@ -5,7 +5,7 @@ import std.nat { Nat }
 import std.checked_arithmetic { CheckedNatReady, CheckedNatOverflow, checked_int_magnitude }
 import std.algebra { trim }
 import v2.std.algebra { filter }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.fabric.demand { ObservationReceiptRef }
 import std.measure { Second, second, second_count }
 import gunbc.serving.engine_progress { EngineProgressSample }
diff --git a/dag/gunbc/harness/harness_seat.dag b/dag/gunbc/harness/harness_seat.dag
index 708c4ab4149..19d77dcfa3a 100644
--- a/dag/gunbc/harness/harness_seat.dag
+++ b/dag/gunbc/harness/harness_seat.dag
@@ -10,7 +10,7 @@ import gunbc.serving.serving_enrollment {
   ServingRouteTurnCeiling, serving_enrolled_routes, serving_route_turn_ceiling_count,
   serving_route,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.harness.harness_seat_pointer { HarnessSeatPointer }
 import gunbc.fabric_event_log_host {
   HostStoreResolved, HostStoreRefused, event_log_store_for_host, now_epoch_seconds,
diff --git a/dag/gunbc/harness/harness_seat_pointer.dag b/dag/gunbc/harness/harness_seat_pointer.dag
index 2b1de8e7f88..c9e4ffb9f4f 100644
--- a/dag/gunbc/harness/harness_seat_pointer.dag
+++ b/dag/gunbc/harness/harness_seat_pointer.dag
@@ -1,7 +1,7 @@
 module gunbc.harness.harness_seat_pointer
 
 import std.types { String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.languages.json.emit { JsonValue, JsonNull, JsonBool, JsonNumber, JsonString, JsonArray, JsonObject, json_kv, json_string, json_object, serialize_json }
 import extdeps.languages.json.parse { JsonDocumentParsed, JsonDocumentUnreadable, JsonMemberFound, JsonMemberAbsent, JsonMemberDuplicated, JsonMemberNotAnObject, parse_json_document, json_object_unique_member }
 import product.capacity.event_chain { PartitionId }
diff --git a/dag/gunbc/heal_candidate.dag b/dag/gunbc/heal_candidate.dag
index 49b0a7bd423..17a82931bbb 100644
--- a/dag/gunbc/heal_candidate.dag
+++ b/dag/gunbc/heal_candidate.dag
@@ -5,7 +5,7 @@ import std.integer { UInt8 }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.bytes { utf8_encode_bytes }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.github.effect { RepositoryPath, is_workflow_projection_path }
 import extdeps.git.object_store {
diff --git a/dag/gunbc/heal_publication.dag b/dag/gunbc/heal_publication.dag
index d0f05a49895..7dc5101d1f8 100644
--- a/dag/gunbc/heal_publication.dag
+++ b/dag/gunbc/heal_publication.dag
@@ -3,7 +3,7 @@ module gunbc.heal_publication
 import std.types { NonEmptyStr, String, List, Int, Bool, CommitSha, FilePath }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.shell
 import extdeps.git.plumbing
diff --git a/dag/gunbc/heal_publication_boundary.dag b/dag/gunbc/heal_publication_boundary.dag
index 02cbf2bac40..ef6b4613620 100644
--- a/dag/gunbc/heal_publication_boundary.dag
+++ b/dag/gunbc/heal_publication_boundary.dag
@@ -1,7 +1,7 @@
 module gunbc.heal_publication_boundary
 
 import std.types { NonEmptyStr, String, List, Int, Bool, CommitSha }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import extdeps.github.effect { RepositoryPath, is_workflow_projection_path }
 import extdeps.github.workflow_runs {
diff --git a/dag/gunbc/heal_publisher_workflow.dag b/dag/gunbc/heal_publisher_workflow.dag
index 5d2a7969015..9788f230f6f 100644
--- a/dag/gunbc/heal_publisher_workflow.dag
+++ b/dag/gunbc/heal_publisher_workflow.dag
@@ -2,7 +2,7 @@ module gunbc.heal_publisher_workflow
 
 
 import std.types { Bool, Int, List, String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { list_map }
 import extdeps.languages.yaml.types { yaml_string, yaml_int, yaml_bool, kv, YamlKeyValue, YamlValue }
 import extdeps.languages.yaml.emit { emit_yaml, EmittedYaml, YamlEmitRefused, yaml_emit_refusal_text }
diff --git a/dag/gunbc/heal_workflow.dag b/dag/gunbc/heal_workflow.dag
index 73575819db0..6f5b8505ce0 100644
--- a/dag/gunbc/heal_workflow.dag
+++ b/dag/gunbc/heal_workflow.dag
@@ -4,7 +4,7 @@ import extdeps.github.expressions { Expression, ContextAccess, Inputs }
 
 
 import std.types { Bool, Int, List, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { list_map }
 import extdeps.languages.yaml.types { yaml_string, yaml_int, yaml_bool, kv, YamlKeyValue }
 import extdeps.languages.yaml.emit { emit_yaml, EmittedYaml, YamlEmitRefused, yaml_emit_refusal_text }
diff --git a/dag/gunbc/host/host_boot_attempt_admission.dag b/dag/gunbc/host/host_boot_attempt_admission.dag
index dba325cc35b..5346e4bfd49 100644
--- a/dag/gunbc/host/host_boot_attempt_admission.dag
+++ b/dag/gunbc/host/host_boot_attempt_admission.dag
@@ -2,7 +2,7 @@ module gunbc.host_boot_attempt_admission
 
 import v2.std.algebra { any }
 import std.types { Bool, FilePath, GitRef, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.decl_ref { decl_ref }
 import std.algebra { trim }
 import std.human_intervention { HumanIntervention, EveryProvision, DischargedAt }
diff --git a/dag/gunbc/host/host_boot_supervision.dag b/dag/gunbc/host/host_boot_supervision.dag
index 050fed4e802..b8e269ae96b 100644
--- a/dag/gunbc/host/host_boot_supervision.dag
+++ b/dag/gunbc/host/host_boot_supervision.dag
@@ -3,7 +3,7 @@ module gunbc.host_boot_supervision
 import std.types { Bool, EpochMs, List, NonEmptyStr }
 import std.nat { Nat }
 import std.measure { Second }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 
 // TWO INDEPENDENT SUPERVISORS CAN RESET A HOST, and the fleet modeled
diff --git a/dag/gunbc/host/host_cli_dependency.dag b/dag/gunbc/host/host_cli_dependency.dag
index 7870f2774bf..90daf89f7a7 100644
--- a/dag/gunbc/host/host_cli_dependency.dag
+++ b/dag/gunbc/host/host_cli_dependency.dag
@@ -11,7 +11,7 @@ import extdeps.netfilter.iptables_legacy { iptables_legacy_save_cli_tool }
 import extdeps.nftables.ruleset { nft_cli_tool }
 import extdeps.shell
 import std.types { String, NonEmptyStr }
-import v2.std.optional { Optional, Present, Absent, optional_absent, optional_present }
+import std.optional { Optional, Present, Absent, optional_absent, optional_present }
 
 // Host CLI placement for wet witnesses: observe whether an executable is on PATH before attempting
 // shell transport. A missing npm on the falsifier runner surfaced as runtime error: failed to
diff --git a/dag/gunbc/host/host_disk_observation.dag b/dag/gunbc/host/host_disk_observation.dag
index ba9a41964c6..796c7a41c21 100644
--- a/dag/gunbc/host/host_disk_observation.dag
+++ b/dag/gunbc/host/host_disk_observation.dag
@@ -5,7 +5,7 @@ import std.measure { ByteSize, byte_size, byte_size_count }
 import std.disposition { ConstructionMechanism, Disposition, Scaffold, SingleAuthority }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import product.host_identity { HostIdentity }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { trim }
 import std.checked_arithmetic { CheckedNatReady, CheckedNatOverflow, checked_int_magnitude }
 import extdeps.tools.gnu_coreutils { df_available_bytes_argv }
diff --git a/dag/gunbc/host/managed_host_boot.dag b/dag/gunbc/host/managed_host_boot.dag
index 54f84d73e9e..88a8a8e75d5 100644
--- a/dag/gunbc/host/managed_host_boot.dag
+++ b/dag/gunbc/host/managed_host_boot.dag
@@ -1,7 +1,7 @@
 module gunbc.managed_host_boot
 
 import std.types { List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity, host_identity_eq }
 import extdeps.bmc.ipmi_boot_selection { IpmiBootSelection }
 import gunbc.machine_intake_mtcollins1_access_observation { mtcollins1_virtual_media_boot_selection }
diff --git a/dag/gunbc/host/managed_host_boot_handoff.dag b/dag/gunbc/host/managed_host_boot_handoff.dag
index 2f0f650fe27..e291a140a94 100644
--- a/dag/gunbc/host/managed_host_boot_handoff.dag
+++ b/dag/gunbc/host/managed_host_boot_handoff.dag
@@ -2,7 +2,7 @@ module gunbc.managed_host_boot_handoff
 
 import std.types { List, NonEmptyStr, String }
 import std.decl_ref { decl_ref }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ExitSuccess, ProcessExit, exit_failure }
 import extdeps.bmc.capability { BmcFirmwareReleaseCapabilityRow }
 import gunbc.managed_host { ManagedHost, ManagedHostBound, ManagedHostAccessUnobserved, ManagedHostNotSecured, ManagedHostEndpointMismatch, managed_host_binding, managed_hosts }
diff --git a/dag/gunbc/host/managed_host_boot_milestone.dag b/dag/gunbc/host/managed_host_boot_milestone.dag
index 310af9a86fa..ce1c217cc08 100644
--- a/dag/gunbc/host/managed_host_boot_milestone.dag
+++ b/dag/gunbc/host/managed_host_boot_milestone.dag
@@ -4,7 +4,7 @@ import std.types { Bool, Int, List, String }
 import std.nat { Nat }
 import std.algebra { trim }
 import std.measure { HardwareThreadCount, hardware_thread_count_value }
-import v2.std.optional { Present }
+import std.optional { Present }
 import gunbc.machine_intake_host_capture_envelope { HostCaptureWorkloadShape }
 
 // WHAT A MILESTONE BOOT MUST SHOW: exactly `threads` hardware threads, ALL of them on `socket`, and
diff --git a/dag/gunbc/host/managed_host_unit_hold.dag b/dag/gunbc/host/managed_host_unit_hold.dag
index 72476f678fd..e249d59d7f0 100644
--- a/dag/gunbc/host/managed_host_unit_hold.dag
+++ b/dag/gunbc/host/managed_host_unit_hold.dag
@@ -6,7 +6,7 @@ import gunbc.process_hold_identity {
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.process { ProcessExit, ExitSuccess, ExitFailure, exit_failure }
 import std.durable_compare_and_set { CasGeneration }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.durable_exclusive_hold {
   DurableHoldOwnerRef, DurableHoldReleaseRef, DurableHoldObservation, DurableHoldReleaseRefusal,
   HoldReleaseSlotAbsent, HoldReleaseAlreadyFree, HoldReleaseHeldByAnotherOwner, HoldReleaseAgainstAnotherGeneration,
diff --git a/dag/gunbc/host/megarac_managed_host.dag b/dag/gunbc/host/megarac_managed_host.dag
index f88ea88d309..8f648453ef4 100644
--- a/dag/gunbc/host/megarac_managed_host.dag
+++ b/dag/gunbc/host/megarac_managed_host.dag
@@ -2,7 +2,7 @@ module gunbc.megarac_managed_host
 
 import std.types { Bool, List, NonEmptyStr, String }
 import std.decl_ref { decl_ref }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import product.placement_supply { HostIdentity }
 import extdeps.bmc.endpoint { AmiMegaRac, BmcControllerEndpoint, BmcFirmwareFamily, OpenBmc }
diff --git a/dag/gunbc/host/megarac_operation_standing.dag b/dag/gunbc/host/megarac_operation_standing.dag
index 29b0cdcb48a..6c6504ba3fc 100644
--- a/dag/gunbc/host/megarac_operation_standing.dag
+++ b/dag/gunbc/host/megarac_operation_standing.dag
@@ -3,7 +3,7 @@ module gunbc.megarac_operation_standing
 import std.types { Bool, EpochMs, List, NonEmptyStr, String }
 import std.content_hash { ContentHash }
 import std.decl_ref { DeclarationRef, decl_ref }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter, any }
 import extdeps.bmc.endpoint { BmcControllerEndpoint }
 import extdeps.bmc.capability { BmcFirmwareReleaseIdentity, bmc_firmware_release_identity_eq }
diff --git a/dag/gunbc/host/verified_archive_install.dag b/dag/gunbc/host/verified_archive_install.dag
index 6f7fdf9a618..83f3fbd8f41 100644
--- a/dag/gunbc/host/verified_archive_install.dag
+++ b/dag/gunbc/host/verified_archive_install.dag
@@ -2,7 +2,7 @@ module gunbc.verified_archive_install
 
 import std.types { NonEmptyStr, List, FilePath, Bool, Int, list_length }
 import std.algebra { list_append }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, ExitSuccess, ExitFailure }
 import extdeps.exec.command { ArgvCommand }
 import extdeps.tools.curl { curl_download_command }
diff --git a/dag/gunbc/host_command_binding.dag b/dag/gunbc/host_command_binding.dag
index ac1f32a3b0f..8e7b08e49c6 100644
--- a/dag/gunbc/host_command_binding.dag
+++ b/dag/gunbc/host_command_binding.dag
@@ -2,7 +2,7 @@ module gunbc.host_command_binding
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.algebra { trim }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.exec.command { ArgvCommand, argv_words, LocalExec }
 import extdeps.shell.exec { ProcessRunOutcome, ProcessRan, ProcessNotSpawned }
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/gunbc/instruments/cause_assertion_census.dag b/dag/gunbc/instruments/cause_assertion_census.dag
index 76050311ce3..df9082a4613 100644
--- a/dag/gunbc/instruments/cause_assertion_census.dag
+++ b/dag/gunbc/instruments/cause_assertion_census.dag
@@ -10,7 +10,7 @@ import v2.workflow.floor_naming_hygiene { floor_entry_requires_test_sidecar }
 import std.algebra { Cons, Empty, list_snoc_item }
 import v2.std.algebra { any, filter }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.decl_index { DataDeclTypeFact, data_decl_type_facts }
 import v2.lens.module_graph { ModuleDeclarationFact, module_declaration_facts_live }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
diff --git a/dag/gunbc/instruments/direct_rust_door_transport.dag b/dag/gunbc/instruments/direct_rust_door_transport.dag
index eff91ec728a..af5d9e2b7e9 100644
--- a/dag/gunbc/instruments/direct_rust_door_transport.dag
+++ b/dag/gunbc/instruments/direct_rust_door_transport.dag
@@ -14,7 +14,7 @@ import v2.compiler.self_host.direct_rust_door_fixture {
   direct_rust_door_target_model
 }
 import v2.std.diagnostic { Accepted, Rejected }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 data direct_rust_door_fixture_lane_tag: String = "direct_rust_door_fixture_containment"
diff --git a/dag/gunbc/instruments/docs_projection_gate.dag b/dag/gunbc/instruments/docs_projection_gate.dag
index 411e5b94da0..3a38c760916 100644
--- a/dag/gunbc/instruments/docs_projection_gate.dag
+++ b/dag/gunbc/instruments/docs_projection_gate.dag
@@ -6,7 +6,7 @@ import gunbc.design_ledgers { expected_design_failure_modes_md, expected_design_
 import gunbc.contributor_onboarding_path { expected_contributor_onboarding_md }
 import gunbc.generated_artifact { GeneratedArtifact, artifact_path, artifact_location, artifact_is_committed, DesignArtifact, DesignFailureModesArtifact, DesignRungDropsArtifact, ContributorOnboardingArtifact, WitnessFloorYamlArtifact, FleetConvergeYamlArtifact, FleetDesiredAdmissionYamlArtifact, MicrovmShakedownYamlArtifact, InstrumentDispatchYamlArtifact, HealWorkflowYamlArtifact, HealPublisherWorkflowYamlArtifact, GitignoreArtifact, GitattributesArtifact, CargoConfigArtifact, RoadmapArtifact, GithooksPrePushArtifact, GithooksPreCommitArtifact, GeneratedArtifactMergeDriverArtifact, RunnerDeployArtifact, Stage0CrateLayoutGeneratedDagArtifact, Stage0CrateLayoutGeneratedRsArtifact, Stage0CratePartitionGeneratedDagArtifact, Stage0ExecutableAssemblyGeneratedDagArtifact, Stage0LinkedPartitionCratesArtifact, SeedRetentionFrontierGeneratedRsArtifact, V1InterpreterDispatchGeneratedRsArtifact, EvaluationBudgetConsequenceGeneratedRsArtifact, ReleaseLocusSeedConstantsGeneratedRsArtifact, FileTransportRealizationGeneratedRsArtifact, Fci1BoundedExecutionContextArtifact, AutoinstallUserDataArtifact, RunnerHostSudoersArtifact, PlanArtifact, CouponCadQueryProgramArtifact, ApprovalDeviceVectorsArtifact, ApproveIosProjectYmlArtifact, ApproveIosProtocolSwiftArtifact, ApproveIosWireSwiftArtifact, ApproveIosProtocolVectorTestsSwiftArtifact }
 import gunbc.generated_artifact_registry { generated_artifact_registry }
-import v2.std.optional { Optional, Absent, Present }
+import std.optional { Optional, Absent, Present }
 import tools.docs_projection_agreement { docs_projection_bytes_agree }
 
 data docs_projection_directory: String = "docs"
diff --git a/dag/gunbc/instruments/e0599_emitter_decision_census.dag b/dag/gunbc/instruments/e0599_emitter_decision_census.dag
index 7405b48e7f4..8e6b93b3421 100644
--- a/dag/gunbc/instruments/e0599_emitter_decision_census.dag
+++ b/dag/gunbc/instruments/e0599_emitter_decision_census.dag
@@ -3,7 +3,7 @@ module tools.e0599_emitter_decision_census
 import std.types { Bool, Int, String, list_length }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.error_primitives { Result, Ok, Err }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.languages.rust.derive_contracts { im_15_1_0_vector_clone_impl_authority }
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/gunbc/instruments/fabric_capacity_standing.dag b/dag/gunbc/instruments/fabric_capacity_standing.dag
index 116654d1d48..97b0b16d936 100644
--- a/dag/gunbc/instruments/fabric_capacity_standing.dag
+++ b/dag/gunbc/instruments/fabric_capacity_standing.dag
@@ -1,7 +1,7 @@
 module gunbc.instruments.fabric_capacity_standing
 
 import std.types { String, Bool, Int, NonEmptyStr, List, EpochSecs }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat }
 import std.algebra { trim }
 import std.checked_arithmetic { checked_int_magnitude, CheckedNatReady, CheckedNatOverflow }
diff --git a/dag/gunbc/instruments/fabric_ci_evidence.dag b/dag/gunbc/instruments/fabric_ci_evidence.dag
index 7b070a5a33d..bc60f1ebc95 100644
--- a/dag/gunbc/instruments/fabric_ci_evidence.dag
+++ b/dag/gunbc/instruments/fabric_ci_evidence.dag
@@ -2,7 +2,7 @@ module tools.fabric_ci_evidence
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.numeric.base16 { base16_word_value }
 import std.content_hash { ContentHash, content_hash_of_value }
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/gunbc/instruments/fabric_control_plane_live_probe.dag b/dag/gunbc/instruments/fabric_control_plane_live_probe.dag
index 9f28e6ba5bf..2c4c9b363c4 100644
--- a/dag/gunbc/instruments/fabric_control_plane_live_probe.dag
+++ b/dag/gunbc/instruments/fabric_control_plane_live_probe.dag
@@ -129,7 +129,7 @@ import gunbc.fabric_witness_run {
   required_witnesses_build_work, verify_git_commit_tree,
 }
 import extdeps.git.object_store { git_sha1_object_id }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.ownership { Owned, Ensured }
 import tools.fabric_ci_evidence {
   FabricCiEvidenceDecode, FabricCiEvidenceDecoded, FabricCiEvidenceUndecodable,
diff --git a/dag/gunbc/instruments/instrument_dispatch_workflow.dag b/dag/gunbc/instruments/instrument_dispatch_workflow.dag
index 37093bb2f73..6342559dc2c 100644
--- a/dag/gunbc/instruments/instrument_dispatch_workflow.dag
+++ b/dag/gunbc/instruments/instrument_dispatch_workflow.dag
@@ -3,7 +3,7 @@ module gunbc.instrument_dispatch_workflow
 import std.types { Bool, Int, List, String }
 import std.algebra { list_append }
 import v2.std.algebra { list_map, filter, length }
-import v2.std.optional { Present }
+import std.optional { Present }
 import v2.std.diagnostic { Outcome, Accepted, Rejected }
 import v2.std.node { Node }
 import extdeps.bazel.label { Label, render_label }
diff --git a/dag/gunbc/instruments/pair_incumbent_identity_standing.dag b/dag/gunbc/instruments/pair_incumbent_identity_standing.dag
index 9918211617e..0b3bcc0b941 100644
--- a/dag/gunbc/instruments/pair_incumbent_identity_standing.dag
+++ b/dag/gunbc/instruments/pair_incumbent_identity_standing.dag
@@ -1,7 +1,7 @@
 module gunbc.instruments.pair_incumbent_identity_standing
 
 import std.types { String, Bool, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import gunbc.clock_read { clock_now_probed_at, probed_at_word }
diff --git a/dag/gunbc/instruments/reference_binding_provenance_calibration.dag b/dag/gunbc/instruments/reference_binding_provenance_calibration.dag
index cdaf1357366..e8308530fe7 100644
--- a/dag/gunbc/instruments/reference_binding_provenance_calibration.dag
+++ b/dag/gunbc/instruments/reference_binding_provenance_calibration.dag
@@ -2,7 +2,7 @@ module gunbc.tools.reference_binding_provenance_calibration
 
 import std.types { Bool, Int, List, SourceSpan, String, list_length }
 import std.process { ProcessExit, ExitSuccess, ExitFailure, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import std.occurrence_identity {
   OccurrenceId,
diff --git a/dag/gunbc/instruments/self_host_behavioral_equivalence_take.dag b/dag/gunbc/instruments/self_host_behavioral_equivalence_take.dag
index de0eeb34737..8b2ea9f7f91 100644
--- a/dag/gunbc/instruments/self_host_behavioral_equivalence_take.dag
+++ b/dag/gunbc/instruments/self_host_behavioral_equivalence_take.dag
@@ -2,7 +2,7 @@ module tools.self_host_behavioral_equivalence_take
 
 import std.types { Bool, Int, String, NonEmptyStr, CommitSha }
 import std.process { ExitSuccess, ExitFailure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
 import v2.std.subject_evidence {
   EvidenceInstrumentRefused,
diff --git a/dag/gunbc/instruments/self_host_module_behavioral_transport_roster.dag b/dag/gunbc/instruments/self_host_module_behavioral_transport_roster.dag
index 73e4d70adc7..963bc334e1c 100644
--- a/dag/gunbc/instruments/self_host_module_behavioral_transport_roster.dag
+++ b/dag/gunbc/instruments/self_host_module_behavioral_transport_roster.dag
@@ -11,7 +11,7 @@ import tools.self_host_curated_seed_linked_harness {
   cssl_seed_linked_behavioral_receipt
 }
 import v2.std.algebra { fold_list }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/dag/gunbc/instruments/source_reference_repoint.dag b/dag/gunbc/instruments/source_reference_repoint.dag
new file mode 100644
index 00000000000..5c0d56fcac9
--- /dev/null
+++ b/dag/gunbc/instruments/source_reference_repoint.dag
@@ -0,0 +1,218 @@
+module tools.source_reference_repoint
+
+import std.types { Bool, Int, List, String }
+import std.process { ProcessExit, ExitSuccess, ExitFailure, exit_failure }
+import extdeps.filesystem.filesystem_io { Filesystem, FilesystemExactPathRead, FilesystemExactPathAbsent, FilesystemExactPathUnreadable, FilesystemExactPathKindUnrecognized }
+import v2.std.compilers.lexing { Token }
+import gunbc.parsed_import_statement_production { parsed_import_observation_live }
+import gunbc.source_root_read { source_root_walk, source_root_read_file, SourceRootWalkTask, SourceRootPathsRead, SourceRootPathsRefused }
+
+// A SOURCE REWRITE IS EDITS BY POSITION, PRODUCED FROM THE SEED'S OWN READING OF THE FILE. A module
+// that moves takes every reference to it along, and those references are found in the seed's token
+// stream rather than by a text search: a comment is not a token, and a path spelled inside a
+// string is one string token, so neither is a reference and neither is touched. The tokens come
+// through gunbc.parsed_import_statement_production, the one crossing by which a module under dag
+// reaches the seed's lexer (the floor resolves dag and src/v2 only), and they are produced
+// natively: tokenizing through the interpreter did not finish 901 files in forty minutes. The producer
+// returns edits; apply_source_edits splices them. A second producer (a literal rewrite over the
+// parse tree) reuses the applier and the walk unchanged.
+//
+// POSITIONS ARE CODE POINTS, because that is the unit the seed tokenizer's spans are in. The
+// applier slices the same code-point list the tokenizer indexed, so a non-ASCII character before
+// an edit cannot shift it.
+type SourceEdit {
+  start: Int
+  end: Int
+  replacement: String
+}
+
+type SpliceState {
+  pieces: List<String>
+  cursor: Int
+}
+
+// Edits are applied in position order and must not overlap; each producer here emits disjoint
+// spans by construction.
+fn apply_source_edits(text: String, edits: List<SourceEdit>) -> String {
+  let cs = chars(text)
+  let ordered = edits |> sort_by(e => e.start)
+  let st = fold(ordered, init: SpliceState { pieces: [], cursor: 0 }, f: (acc, e) =>
+    SpliceState {
+      pieces: list_push(list_push(acc.pieces, chars_to_string(chars: cs, start: acc.cursor, end: e.start)), e.replacement),
+      cursor: e.end
+    })
+  join(list_push(st.pieces, chars_to_string(chars: cs, start: st.cursor, end: count(cs))), "")
+}
+
+// ONE MODULE PATH MOVING TO ANOTHER. Three reference forms carry a module path and all three are
+// rewritten: the path of an import, the prefix of a qualified name, and the module_path of a
+// DeclarationRef row (a string, but one whose position says it names a module).
+type ReferenceRepoint {
+  from_path: String
+  to_path: String
+}
+
+fn token_is_word(tok: Token, word: String) -> Bool {
+  (tok.class == ^ShIdent || tok.class == ^ShKeyword) && tok.lexeme == word
+}
+
+// ONE PASS OVER THE TOKENS, carrying how much of the path the current dotted name has matched.
+// `matched` counts whole segments; `after_word` says the next token must be a dot to continue.
+// `prev_dot` is what makes a match begin only at the START of a dotted name: the segments inside a
+// longer chain are never a second match, and a field access spelled like the path's tail is not
+// one. `prev_colon` and `before_colon_is_module_path` recognise the one string position that
+// names a module.
+type RepointScan {
+  edits: List<SourceEdit>
+  matched: Int
+  after_word: Bool
+  start: Int
+  prev_dot: Bool
+  prev_colon: Bool
+  prev_is_module_path: Bool
+  before_colon_is_module_path: Bool
+}
+
+fn repoint_scan_carry(scan: RepointScan, tok: Token, edits: List<SourceEdit>, matched: Int, after_word: Bool, start: Int) -> RepointScan {
+  RepointScan {
+    edits: edits, matched: matched, after_word: after_word, start: start,
+    prev_dot: tok.class == ^ShDot,
+    prev_colon: tok.class == ^ShColon,
+    prev_is_module_path: token_is_word(tok: tok, word: "module_path"),
+    before_colon_is_module_path: scan.prev_is_module_path
+  }
+}
+
+fn segment_at(segments: List<String>, at: Int) -> String {
+  match segments |> skip(at) |> first {
+    Present { value: seg } => seg
+    Absent => ""
+  }
+}
+
+// A word that completes the path emits the edit and ends the match; what follows the matched
+// prefix is not inspected, so an import path (which ends there) and a qualified name (which
+// continues) both keep their remainder. The match is by whole segments, so a module whose last
+// segment merely starts with the moved one is left alone.
+fn repoint_scan_word(scan: RepointScan, tok: Token, segments: List<String>, repoint: ReferenceRepoint, matched: Int, start: Int) -> RepointScan {
+  if matched == count(segments) {
+    repoint_scan_carry(scan: scan, tok: tok, edits: list_push(scan.edits, SourceEdit { start: start, end: tok.end, replacement: repoint.to_path }), matched: 0, after_word: false, start: 0)
+  } else {
+    repoint_scan_carry(scan: scan, tok: tok, edits: scan.edits, matched: matched, after_word: true, start: start)
+  }
+}
+
+fn repoint_scan_step(scan: RepointScan, tok: Token, segments: List<String>, repoint: ReferenceRepoint) -> RepointScan {
+  let is_dot = tok.class == ^ShDot
+  if is_dot && scan.matched > 0 && scan.after_word {
+    repoint_scan_carry(scan: scan, tok: tok, edits: scan.edits, matched: scan.matched, after_word: false, start: scan.start)
+  } else if scan.matched > 0 && !scan.after_word && token_is_word(tok: tok, word: segment_at(segments: segments, at: scan.matched)) {
+    repoint_scan_word(scan: scan, tok: tok, segments: segments, repoint: repoint, matched: scan.matched + 1, start: scan.start)
+  } else if !scan.prev_dot && token_is_word(tok: tok, word: segment_at(segments: segments, at: 0)) {
+    repoint_scan_word(scan: scan, tok: tok, segments: segments, repoint: repoint, matched: 1, start: tok.start)
+  } else if tok.class == ^ShLitStr && tok.lexeme == join(["\"", repoint.from_path, "\""], "") && scan.prev_colon && scan.before_colon_is_module_path {
+    repoint_scan_carry(scan: scan, tok: tok, edits: list_push(scan.edits, SourceEdit { start: tok.start + 1, end: tok.end - 1, replacement: repoint.to_path }), matched: 0, after_word: false, start: 0)
+  } else {
+    repoint_scan_carry(scan: scan, tok: tok, edits: scan.edits, matched: 0, after_word: false, start: 0)
+  }
+}
+
+fn module_path_repoint_edits(tokens: List<Token>, repoint: ReferenceRepoint) -> List<SourceEdit> {
+  let segments = split(s: repoint.from_path, delimiter: ".")
+  if count(segments) == 0 || repoint.from_path == "" { [] }
+  else {
+    fold(tokens, init: RepointScan { edits: [], matched: 0, after_word: false, start: 0, prev_dot: false, prev_colon: false, prev_is_module_path: false, before_colon_is_module_path: false }, f: (scan, tok) =>
+      repoint_scan_step(scan: scan, tok: tok, segments: segments, repoint: repoint)).edits
+  }
+}
+
+// The whole rewrite of one file's text. A file that does not mention the path is not tokenized:
+// containing the path's spelling is necessary for holding a reference to it.
+fn repointed_source_text(path: String, text: String, repoints: List<ReferenceRepoint>) -> String {
+  fold(repoints, init: text, f: (current, r) =>
+    if string_contains(s: current, pattern: r.from_path) {
+      apply_source_edits(text: current, edits: module_path_repoint_edits(tokens: parsed_import_observation_live(file: path, source: current).tokens, repoint: r))
+    } else { current })
+}
+
+// THE MOVES THIS TREE HAS MADE THROUGH THIS INSTRUMENT. Re-running after a move is a no-op: the
+// rewritten text holds no reference to the old path, so no edit is produced.
+data source_reference_repoints: List<ReferenceRepoint> = [
+  ReferenceRepoint { from_path: "v2.std.optional", to_path: "std.optional" }
+]
+
+data source_reference_repoint_roots: List<String> = ["dag", "src/v2", "src/v1", "fixtures"]
+
+fn repoint_write(path: String, content: String) -> ProcessExit {
+  let w = Filesystem.Write(path: path, content: content)
+  if w.success { ExitSuccess }
+  else { exit_failure(reason: join(["source reference repoint: write failed for ", path, ": ", w.error], "")) }
+}
+
+// ONE FILE AT A TIME. The walk yields paths; each file is read, rewritten and written before the
+// next is read, so nothing is held but the path list. A file that does not mention a moved path is
+// read and dropped without being tokenized.
+fn repoint_one_path(path: String) -> ProcessExit {
+  match source_root_read_file(path: path) {
+    FilesystemExactPathRead { path: observed, content: content } =>
+      repoint_one_text(path: observed, content: content)
+    FilesystemExactPathAbsent { path: missing } =>
+      exit_failure(reason: join(["source reference repoint: cannot read ", missing, " (absent)"], ""))
+    FilesystemExactPathUnreadable { path: unreadable, kind: _, error: error } =>
+      exit_failure(reason: join(["source reference repoint: cannot read ", unreadable, ": ", error], ""))
+    FilesystemExactPathKindUnrecognized { path: unrecognized, observed: observed, error: error } =>
+      exit_failure(reason: join(["source reference repoint: cannot read ", unrecognized, " (", observed, "): ", error], ""))
+  }
+}
+
+fn repoint_one_text(path: String, content: String) -> ProcessExit {
+  let next = repointed_source_text(path: path, text: content, repoints: source_reference_repoints)
+  if next == content { ExitSuccess }
+  else { repoint_write(path: path, content: next) }
+}
+
+// A file the walk listed but cannot read is reported as pending, so the verdict refuses and
+// names it: an unread file is never counted as already repointed.
+fn repoint_path_is_pending(path: String) -> Bool {
+  match source_root_read_file(path: path) {
+    FilesystemExactPathRead { path: observed, content: content } =>
+      repointed_source_text(path: observed, text: content, repoints: source_reference_repoints) != content
+    FilesystemExactPathAbsent { path: _ } => true
+    FilesystemExactPathUnreadable { path: _, kind: _, error: _ } => true
+    FilesystemExactPathKindUnrecognized { path: _, observed: _, error: _ } => true
+  }
+}
+
+fn repoint_pending_verdict(pending: List<String>) -> ProcessExit {
+  if count(pending) == 0 { ExitSuccess }
+  else { exit_failure(reason: join(["source reference repoint: ", join(pending, " "), " still reference a moved module; run the repoint entry"], "")) }
+}
+
+fn repoint_root_tasks() -> List<SourceRootWalkTask> {
+  source_reference_repoint_roots |> map(path => SourceRootWalkTask { path: path, root: true })
+}
+
+// The wet entry: rewrite every file under the roots that still references a moved module.
+fn repoint() -> ProcessExit {
+  match source_root_walk(pending: repoint_root_tasks(), paths: []) {
+    SourceRootPathsRefused { path: path, kind: kind, cause: cause } =>
+      exit_failure(reason: join(["source reference repoint: cannot walk ", path, " (", kind, "): ", cause], ""))
+    SourceRootPathsRead { paths: paths } =>
+      fold(paths, init: ExitSuccess, f: fn(acc, path) {
+        match acc {
+          ExitFailure { code, reason } => ExitFailure { code: code, reason: reason }
+          ExitSuccess => repoint_one_path(path: path)
+        }
+      })
+  }
+}
+
+// The read-only entry: fails, naming the files, while any reference to a moved module remains.
+fn repoint_pending() -> ProcessExit {
+  match source_root_walk(pending: repoint_root_tasks(), paths: []) {
+    SourceRootPathsRefused { path: path, kind: kind, cause: cause } =>
+      exit_failure(reason: join(["source reference repoint: cannot walk ", path, " (", kind, "): ", cause], ""))
+    SourceRootPathsRead { paths: paths } =>
+      repoint_pending_verdict(pending: paths |> filter(path => repoint_path_is_pending(path: path)))
+  }
+}
diff --git a/dag/gunbc/instruments/type_declaration_use_census.dag b/dag/gunbc/instruments/type_declaration_use_census.dag
index b0a4bac315b..c2423277cb0 100644
--- a/dag/gunbc/instruments/type_declaration_use_census.dag
+++ b/dag/gunbc/instruments/type_declaration_use_census.dag
@@ -13,7 +13,7 @@ import v2.std.node {
 }
 import v2.std.type_binder { GenericTypeDecl, OpaqueTypeDecl, PlainTypeDecl, TypeAlias, type_decl_view, type_param_names }
 import v2.std.qualified_name { declaration_reference_path_optional, qualified_name_to_dotted_string }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.grammar { node_atom_identity_optional }
 
 import v2.compiler.infer { RefinementDeclaration, refinement_declaration_of_node }
diff --git a/dag/gunbc/instruments/type_declaration_use_census_reading.dag b/dag/gunbc/instruments/type_declaration_use_census_reading.dag
index 0b869e5e097..aea619d7538 100644
--- a/dag/gunbc/instruments/type_declaration_use_census_reading.dag
+++ b/dag/gunbc/instruments/type_declaration_use_census_reading.dag
@@ -2,7 +2,7 @@ module gunbc.instruments.type_declaration_use_census_reading
 
 import std.types { String, Bool, List, Int }
 import std.algebra { Cons, Empty }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import std.process { ProcessExit, ExitSuccess, ExitFailure }
 import gunbc.cli_wire { CliWireResponse, CliWirePrintable }
 import v2.workflow.required_floor { required_gate_admits }
diff --git a/dag/gunbc/instruments/workspace_entry_decode_scaling.dag b/dag/gunbc/instruments/workspace_entry_decode_scaling.dag
index 0014f109164..fe354f99ac8 100644
--- a/dag/gunbc/instruments/workspace_entry_decode_scaling.dag
+++ b/dag/gunbc/instruments/workspace_entry_decode_scaling.dag
@@ -1,7 +1,7 @@
 module gunbc.instruments.workspace_entry_decode_scaling
 
 import std.types { String, NonEmptyStr, Int, Bool, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { Cons, Empty }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.measure { byte_size, Nanosecond, nanosecond, nanosecond_count, ObservationInstant, ProcessMonotonic, WallClock }
diff --git a/dag/gunbc/jws_signer_realize.dag b/dag/gunbc/jws_signer_realize.dag
index e39dc3f577e..c434bd44fee 100644
--- a/dag/gunbc/jws_signer_realize.dag
+++ b/dag/gunbc/jws_signer_realize.dag
@@ -4,7 +4,7 @@ import std.types { String, NonEmptyStr }
 import extdeps.auth.jws { JwsSigningKeyRef, HostKeyFile, JwsSignOutcome, JwsSigned, JwsSignRefused }
 import extdeps.tools.openssl { openssl_sign_sha256, OpensslSigned, OpensslSignRefused }
 import gunbc.host_cli_dependency { first_absent_host_cli_dependency, jws_signer_host_cli_requirements }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // THE HANDLER DISPATCH FOR extdeps.auth.jws's signer interface, kept peripheral because selecting a
 // realization is itself realization (DESIGN §3). A key held as a HOST FILE is signed by openssl,
diff --git a/dag/gunbc/live_deploy/readiness.dag b/dag/gunbc/live_deploy/readiness.dag
index 9b40397e718..c2009789fb0 100644
--- a/dag/gunbc/live_deploy/readiness.dag
+++ b/dag/gunbc/live_deploy/readiness.dag
@@ -3,7 +3,7 @@ module gunbc.live_deploy.readiness
 import std.types { String, Bool, Int, NonEmptyStr, List, CommitSha }
 import std.evaluation_budget { LimitSet, LimitUnset }
 import std.measure { positive_millisecond_count, Second, second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { Fnv1a64Structural }
 import gunbc.live_deploy.candidate_identity { CandidateRelease }
 import gunbc.readiness { Readiness, Ready, Pending, Refused }
diff --git a/dag/gunbc/machine_intake/ampere_checkpoint_console_observation.dag b/dag/gunbc/machine_intake/ampere_checkpoint_console_observation.dag
index 8d3936238f1..5c2de49298a 100644
--- a/dag/gunbc/machine_intake/ampere_checkpoint_console_observation.dag
+++ b/dag/gunbc/machine_intake/ampere_checkpoint_console_observation.dag
@@ -3,7 +3,7 @@ module gunbc.machine_intake_ampere_checkpoint_console_observation
 import v2.std.algebra { any, filter }
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.algebra { trim }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.tools.sha256sum { Sha256FileDigest }
 import gunbc.machine_intake_pre_os_bringup_verdict { firmware_checkpoint_line_prefix }
 import gunbc.machine_intake_ampere_dram_console_observation { ampere_dram_fw_version_marker, ampere_dram_console_line }
diff --git a/dag/gunbc/machine_intake/ampere_dram_console_observation.dag b/dag/gunbc/machine_intake/ampere_dram_console_observation.dag
index e1a19ab0fba..0d40f8bdd6d 100644
--- a/dag/gunbc/machine_intake/ampere_dram_console_observation.dag
+++ b/dag/gunbc/machine_intake/ampere_dram_console_observation.dag
@@ -2,7 +2,7 @@ module gunbc.machine_intake_ampere_dram_console_observation
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.algebra { trim }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 // WHAT THE AMPERE DRAM FIRMWARE PRINTED ON THE SERIAL CONSOLE DURING ONE BOOT, as an observation
 // receipt of this repository. It is not an upstream fact: Ampere publishes no specification of these
diff --git a/dag/gunbc/machine_intake/ampere_nvparam_console_observation.dag b/dag/gunbc/machine_intake/ampere_nvparam_console_observation.dag
index f854dd5363a..dc0a76e1a7e 100644
--- a/dag/gunbc/machine_intake/ampere_nvparam_console_observation.dag
+++ b/dag/gunbc/machine_intake/ampere_nvparam_console_observation.dag
@@ -5,7 +5,7 @@ import std.algebra { Cons }
 import std.measure { byte_size_count }
 import std.types { Bool, Int, List, Map, NonEmptyStr, String }
 import std.algebra { trim }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.numeric.base16 { base16_word_value }
 import extdeps.ampere.nvparam {
   NvParamRegion, NvPreboot, NvManufacturing, NvUser, NvBoard,
diff --git a/dag/gunbc/machine_intake/ampere_smpro_observation.dag b/dag/gunbc/machine_intake/ampere_smpro_observation.dag
index fa576361bc5..21bf4ccdce1 100644
--- a/dag/gunbc/machine_intake/ampere_smpro_observation.dag
+++ b/dag/gunbc/machine_intake/ampere_smpro_observation.dag
@@ -4,7 +4,7 @@ import v2.std.algebra { filter, any }
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.algebra { trim }
 import std.measure { Second }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.bmc.ipmi
 import extdeps.tools.gnu_coreutils { coreutils_duration_operand, coreutils_timeout_expired_exit_code }
 import extdeps.bmc.ipmi_master_write_read {
diff --git a/dag/gunbc/machine_intake/ampere_socket_console_observation.dag b/dag/gunbc/machine_intake/ampere_socket_console_observation.dag
index b7e613dd985..b328123b9f1 100644
--- a/dag/gunbc/machine_intake/ampere_socket_console_observation.dag
+++ b/dag/gunbc/machine_intake/ampere_socket_console_observation.dag
@@ -2,7 +2,7 @@ module gunbc.machine_intake_ampere_socket_console_observation
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.algebra { trim }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.languages.json.parse { json_hex_nibble }
 import extdeps.ampere.ras_error_section {
   AmpereRasSectionHeader, AmpereRasErrorTypeReading, AmpereRasTypeDefined, AmpereRasTypeUndefined,
diff --git a/dag/gunbc/machine_intake/boot_image_export_ownership.dag b/dag/gunbc/machine_intake/boot_image_export_ownership.dag
index fe9e1d690f1..8d4df4f1aad 100644
--- a/dag/gunbc/machine_intake/boot_image_export_ownership.dag
+++ b/dag/gunbc/machine_intake/boot_image_export_ownership.dag
@@ -2,7 +2,7 @@ module gunbc.machine_intake_boot_image_export_ownership
 
 import std.types { Bool, Int, NonEmptyStr, String }
 import std.algebra { trim }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.tools.gnu_coreutils { ls_long_directory_command, ls_long_directory_numeric_command }
 import gunbc.host_command_binding { CommandHost, LocalCommandHost, HostCommandDone, host_command, host_command_outcome_text }
 import std.process { ExitSuccess, ProcessExit, exit_failure }
diff --git a/dag/gunbc/machine_intake/boot_image_fetch.dag b/dag/gunbc/machine_intake/boot_image_fetch.dag
index 8b166109755..40e77e1b365 100644
--- a/dag/gunbc/machine_intake/boot_image_fetch.dag
+++ b/dag/gunbc/machine_intake/boot_image_fetch.dag
@@ -21,7 +21,7 @@ import extdeps.tools.gnu_coreutils { ln_hard_command, rm_force_command }
 import extdeps.posix.test_utility { test_regular_file_command }
 import std.algebra { trim }
 import std.content_hash { sha256_hex_digest }
-import v2.std.optional { Present }
+import std.optional { Present }
 import gunbc.host_command_binding {
   CommandHost, LocalCommandHost, HostCommandDone, HostCommandFailed, HostCommandUnconfirmed, HostCommandNotDispatched,
   host_command, host_command_outcome_text,
diff --git a/dag/gunbc/machine_intake/host_capture_envelope.dag b/dag/gunbc/machine_intake/host_capture_envelope.dag
index 9a3bdb64a01..071cb7d1c05 100644
--- a/dag/gunbc/machine_intake/host_capture_envelope.dag
+++ b/dag/gunbc/machine_intake/host_capture_envelope.dag
@@ -15,7 +15,7 @@ import std.measure {
   mebibyte_count,
   mebibyte_to_byte_size,
 }
-import v2.std.optional { Present }
+import std.optional { Present }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
 import extdeps.posix.shell_command_language { posix_single_quote }
 import gunbc.machine_intake_terminal_transcript { terminal_transcript_lines }
diff --git a/dag/gunbc/machine_intake/host_capture_historical_binding.dag b/dag/gunbc/machine_intake/host_capture_historical_binding.dag
index 92360703a41..c7bbd0d888b 100644
--- a/dag/gunbc/machine_intake/host_capture_historical_binding.dag
+++ b/dag/gunbc/machine_intake/host_capture_historical_binding.dag
@@ -3,7 +3,7 @@ module gunbc.machine_intake_host_capture_historical_binding
 import std.types { Bool, List, NonEmptyStr, String }
 import std.content_hash { ContentHash }
 import std.measure { ByteSize }
-import v2.std.optional { Present }
+import std.optional { Present }
 import gunbc.machine_intake_host_capture_envelope {
   HostCaptureStage,
   host_capture_argv_open,
diff --git a/dag/gunbc/machine_intake/host_resource_observation.dag b/dag/gunbc/machine_intake/host_resource_observation.dag
index 3192f9b47e2..ddcb4ee8b2b 100644
--- a/dag/gunbc/machine_intake/host_resource_observation.dag
+++ b/dag/gunbc/machine_intake/host_resource_observation.dag
@@ -9,7 +9,7 @@ import std.measure {
   Kibibyte, kibibyte, kibibyte_count, kibibyte_to_byte_size,
 }
 import std.goal_assessment { GoalAssessment, GoalSatisfied, GoalDiverged, GoalIndeterminate, GoalAssessmentRefused, ObservationAttempt, ObservationEstablished, ObservationRefused, assess_by_deviations_and_unknowns }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.algebra { non_empty_to_list }
 import v2.std.cardinality { Never }
 import extdeps.toolchain.types { Architecture }
diff --git a/dag/gunbc/machine_intake/kernel_module_decompression_observation.dag b/dag/gunbc/machine_intake/kernel_module_decompression_observation.dag
index f5982032f73..5eef7ae9ca3 100644
--- a/dag/gunbc/machine_intake/kernel_module_decompression_observation.dag
+++ b/dag/gunbc/machine_intake/kernel_module_decompression_observation.dag
@@ -3,7 +3,7 @@ module gunbc.machine_intake_kernel_module_decompression_observation
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.algebra { trim }
 import v2.std.algebra { filter }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.linux.module_decompress { linux_module_zstd_decompress_failed_prefix, linux_module_zstd_decompress_failed_stem, ZstdErrorCode, zstd_error_code_of, zstd_error_code_name }
 import extdeps.kmod.libkmod { libkmod_insert_failed_prefix, libkmod_insert_failed_stem, libkmod_insert_failed_path_end }
 
diff --git a/dag/gunbc/machine_intake/linux_boot_console_observation.dag b/dag/gunbc/machine_intake/linux_boot_console_observation.dag
index 3da37c49724..f67974a59e5 100644
--- a/dag/gunbc/machine_intake/linux_boot_console_observation.dag
+++ b/dag/gunbc/machine_intake/linux_boot_console_observation.dag
@@ -3,7 +3,7 @@ module gunbc.machine_intake_linux_boot_console_observation
 import v2.std.algebra { any, filter }
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.algebra { trim }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.linux.efi_stub { linux_efi_stub_line_prefix, linux_efi_stub_initrd_load_failed_prefix, linux_efi_load_error_rendering }
 import extdeps.linux.boot_console { linux_banner_prefix, linux_kernel_panic_prefix, linux_kernel_panic_end_marker }
 
diff --git a/dag/gunbc/machine_intake/megarac_kvm_still.dag b/dag/gunbc/machine_intake/megarac_kvm_still.dag
index 8fefa3f2131..ee6a5829efd 100644
--- a/dag/gunbc/machine_intake/megarac_kvm_still.dag
+++ b/dag/gunbc/machine_intake/megarac_kvm_still.dag
@@ -24,7 +24,7 @@ import gunbc.megarac_managed_host { AdmittedMegaRacHost }
 import gunbc.megarac_operation_standing { MegaRacKvmCanvasStill, MegaRacVirtualMediaAttach, MegaRacSdrSocketNaming }
 import gunbc.clock_read { clock_now_probed_at_or_unknown }
 import gunbc.owned_process { OwnedRelease, OwnedProcessStanding, OwnedRunning, owned_process_release, owned_release_text, owned_process_standing, owned_process_standing_text }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import extdeps.shell
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/gunbc/machine_intake/megarac_sensor_observation.dag b/dag/gunbc/machine_intake/megarac_sensor_observation.dag
index c42dfcbb5b6..b12d0d3e8ec 100644
--- a/dag/gunbc/machine_intake/megarac_sensor_observation.dag
+++ b/dag/gunbc/machine_intake/megarac_sensor_observation.dag
@@ -3,7 +3,7 @@ module gunbc.machine_intake_megarac_sensor_observation
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import gunbc.machine_intake_mtcollins1_power_on_account { BmcAnomaly, SensorNotNominal, SensorLineWithoutReadingNotNominal, SocketSensorsAbsent }
 import std.algebra { trim }
-import v2.std.optional { Present }
+import std.optional { Present }
 import v2.std.algebra { filter }
 import extdeps.bmc.ipmi_sdr { SdrLineResult, SdrLineDecoded, SdrLineUnstructured, SdrTypeLine }
 import extdeps.bmc.capability { BmcFirmwareReleaseIdentity, bmc_firmware_release_identity_eq }
diff --git a/dag/gunbc/machine_intake/megarac_ui_features.dag b/dag/gunbc/machine_intake/megarac_ui_features.dag
index 90c129aacc4..510a5efa0ae 100644
--- a/dag/gunbc/machine_intake/megarac_ui_features.dag
+++ b/dag/gunbc/machine_intake/megarac_ui_features.dag
@@ -4,7 +4,7 @@ import extdeps.tools.sha256sum
 import extdeps.tools.gzip
 import std.algebra { trim }
 import std.types { Bool, FilePath, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ExitSuccess, ProcessExit, exit_failure }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import gunbc.machine_intake_megarac_served_ui_catalog_observation { megarac_source_min_js_sha256_2026_09_27 }
diff --git a/dag/gunbc/machine_intake/mtcollins1_boot_diagnostic_bundle.dag b/dag/gunbc/machine_intake/mtcollins1_boot_diagnostic_bundle.dag
index 33eb07044a3..3dfb962c66c 100644
--- a/dag/gunbc/machine_intake/mtcollins1_boot_diagnostic_bundle.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_boot_diagnostic_bundle.dag
@@ -15,7 +15,7 @@ import extdeps.tools.coreutils_stat
 import std.process { ProcessExit, ExitSuccess, ExitFailure }
 import std.goal_assessment { ObservationAttempt, ObservationEstablished, ObservationRefused }
 import gunbc.managed_host_boot_phase_timing { BootPhaseTiming, boot_phase_timing_not_taken, boot_phase_timing_text }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.bmc.ipmi
 import extdeps.bmc.ipmi_boot_selection { IpmiBootSelection }
 import extdeps.bmc.ipmi_chassis_control { ChassisPowerObservation, ChassisPowerRead, chassis_observation, chassis_observation_text }
diff --git a/dag/gunbc/machine_intake/mtcollins1_boot_run.dag b/dag/gunbc/machine_intake/mtcollins1_boot_run.dag
index 185e28daba4..1348fceb4f2 100644
--- a/dag/gunbc/machine_intake/mtcollins1_boot_run.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_boot_run.dag
@@ -72,7 +72,7 @@ import extdeps.bootloader.grub {
 }
 import gunbc.machine_intake_mtcollins1_access_observation { mtcollins1_endpoint, mtcollins1_boot_ipmi_read_deadline, mtcollins1_boot_ipmi_kill_after }
 import gunbc.host_reset_return_run { host_reset_bmc_credential_path_env }
-import v2.std.optional { Present }
+import std.optional { Present }
 import gunbc.actions_run_binding { ActionsVariableRead, actions_variable_read, ActionsVariablePresent, ActionsVariableAbsent, actions_variable_trimmed }
 import extdeps.github.actions_environment { github_run_id_variable_name, github_sha_variable_name }
 import extdeps.bmc.ipmi
diff --git a/dag/gunbc/machine_intake/mtcollins1_census_image.dag b/dag/gunbc/machine_intake/mtcollins1_census_image.dag
index d0d2407f868..f3d56548f12 100644
--- a/dag/gunbc/machine_intake/mtcollins1_census_image.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_census_image.dag
@@ -15,7 +15,7 @@ import extdeps.provisioning.ubuntu_seeded_install_media {
 import extdeps.os.ubuntu_autoinstall { UbuntuAutoinstallLiveCommands }
 import gunbc.os_install_emit { autoinstall_live_commands_user_data, AutoinstallUserData, AutoinstallUserDataRendered, AutoinstallUserDataRefused }
 import gunbc.seeded_install_media_policy { seeded_install_media_pinned_dates, seeded_install_media_builder_revision }
-import v2.std.optional { Present }
+import std.optional { Present }
 import gunbc.boot_medium { BootImageExport, BootMedium, BootMediumNoTerminal, BootMediumVolumeLabel, bmc_boot_image_export, boot_image_export_eq, stock_installer_boot_medium }
 import gunbc.machine_intake_boot_image_fetch { boot_image_published_path }
 import gunbc.machine_intake_host_capture_envelope {
diff --git a/dag/gunbc/machine_intake/mtcollins1_census_image_publish.dag b/dag/gunbc/machine_intake/mtcollins1_census_image_publish.dag
index 3773f2e31ea..d9766f8a304 100644
--- a/dag/gunbc/machine_intake/mtcollins1_census_image_publish.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_census_image_publish.dag
@@ -2,7 +2,7 @@ module gunbc.machine_intake_mtcollins1_census_image_publish
 
 import std.types { Bool, NonEmptyStr, String }
 import std.process { ExitSuccess, ProcessExit, exit_failure }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.tools.gnu_coreutils { mktemp_directory_command, rm_recursive_force_one_file_system_command }
 import extdeps.provisioning.ubuntu_seeded_install_media { UbuntuSeededInstallMediaBuildInput, UbuntuSeededInstallMediaBuilt, seeded_install_media_build_key }
diff --git a/dag/gunbc/machine_intake/mtcollins1_census_qemu_host_observe.dag b/dag/gunbc/machine_intake/mtcollins1_census_qemu_host_observe.dag
index 42c898e8bb7..27238186ccb 100644
--- a/dag/gunbc/machine_intake/mtcollins1_census_qemu_host_observe.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_census_qemu_host_observe.dag
@@ -2,7 +2,7 @@ module gunbc.machine_intake_mtcollins1_census_qemu_host_observe
 
 import std.types { NonEmptyStr, String }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.tools.mkdir { mkdir_parents_command }
 import gunbc.command_runner { run_shell_commands, LocalExec }
diff --git a/dag/gunbc/machine_intake/mtcollins1_census_qemu_toolchain_converge.dag b/dag/gunbc/machine_intake/mtcollins1_census_qemu_toolchain_converge.dag
index a25194a650b..01ae0acd579 100644
--- a/dag/gunbc/machine_intake/mtcollins1_census_qemu_toolchain_converge.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_census_qemu_toolchain_converge.dag
@@ -2,7 +2,7 @@ module gunbc.machine_intake_mtcollins1_census_qemu_toolchain_converge
 
 import std.types { NonEmptyStr, String }
 import std.process { ProcessExit, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.hostname_read { HostnameShortCaptured }
 import gunbc.runner_microvm_host_ready {
   MicrovmHostBound, MicrovmHostBindingRefused, microvm_host_binding_wet, microvm_host_binding_refusal_text, executor_home_wet,
diff --git a/dag/gunbc/machine_intake/mtcollins1_census_refusal_hypotheses.dag b/dag/gunbc/machine_intake/mtcollins1_census_refusal_hypotheses.dag
index d42a3ca63b8..c5ea6743f4e 100644
--- a/dag/gunbc/machine_intake/mtcollins1_census_refusal_hypotheses.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_census_refusal_hypotheses.dag
@@ -1,7 +1,7 @@
 module gunbc.machine_intake_mtcollins1_census_refusal_hypotheses
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import std.decl_ref { decl_ref }
 import std.dissolution { unbound_dissolution }
diff --git a/dag/gunbc/machine_intake/mtcollins1_console_milestone_observation.dag b/dag/gunbc/machine_intake/mtcollins1_console_milestone_observation.dag
index e09cdf072ea..cb155725666 100644
--- a/dag/gunbc/machine_intake/mtcollins1_console_milestone_observation.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_console_milestone_observation.dag
@@ -2,7 +2,7 @@ module gunbc.machine_intake_mtcollins1_console_milestone_observation
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.algebra { trim }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.bootloader.grub { grub_console_banner_prefix, grub_failed_default_and_fallback, grub_error_prefix }
 import extdeps.linux.module_decompress { linux_module_zstd_decompress_failed_stem }
 import gunbc.machine_intake_pre_os_bringup_verdict { is_firmware_error_line, is_firmware_err_code_line }
diff --git a/dag/gunbc/machine_intake/mtcollins1_kvm_observer_observe.dag b/dag/gunbc/machine_intake/mtcollins1_kvm_observer_observe.dag
index 625a23f903a..ea2c52c9eeb 100644
--- a/dag/gunbc/machine_intake/mtcollins1_kvm_observer_observe.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_kvm_observer_observe.dag
@@ -4,7 +4,7 @@ import std.types { Bool, Int, List, NonEmptyStr }
 import std.algebra { trim }
 import std.measure { Second, second, second_count }
 import std.process { ExitSuccess, ExitFailure, ProcessExit, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.github.actions_environment { github_run_id_variable_name }
 import gunbc.actions_run_binding { actions_variable_read, ActionsVariablePresent, ActionsVariableAbsent }
diff --git a/dag/gunbc/machine_intake/mtcollins1_power_on_account.dag b/dag/gunbc/machine_intake/mtcollins1_power_on_account.dag
index f243734dd90..454e17bba52 100644
--- a/dag/gunbc/machine_intake/mtcollins1_power_on_account.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_power_on_account.dag
@@ -4,7 +4,7 @@ import v2.std.algebra { any, filter }
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.nat { Nat }
 import std.checked_arithmetic { checked_int_to_nat }
-import v2.std.optional { Present }
+import std.optional { Present }
 import std.decl_ref { DeclarationRef, decl_ref }
 import extdeps.tools.sha256sum { Sha256FileDigest, Sha256FileDigestUnavailable }
 import extdeps.ampere.scp_diagnostic {
diff --git a/dag/gunbc/machine_intake/mtcollins1_smpro_error_reading.dag b/dag/gunbc/machine_intake/mtcollins1_smpro_error_reading.dag
index 89c995e1fe8..6965776db68 100644
--- a/dag/gunbc/machine_intake/mtcollins1_smpro_error_reading.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_smpro_error_reading.dag
@@ -2,7 +2,7 @@ module gunbc.machine_intake_mtcollins1_smpro_error_reading
 
 import v2.std.algebra { filter }
 import std.types { Int, List, NonEmptyStr, String }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.crypto.hash { Digest, sha256_digest }
 import extdeps.bmc.ipmi_master_write_read { master_write_read_slave_byte }
 import extdeps.ampere.smpro_register {
diff --git a/dag/gunbc/machine_intake/mtcollins1_ui_bundle_observe.dag b/dag/gunbc/machine_intake/mtcollins1_ui_bundle_observe.dag
index c5d6c989c8d..800a5724def 100644
--- a/dag/gunbc/machine_intake/mtcollins1_ui_bundle_observe.dag
+++ b/dag/gunbc/machine_intake/mtcollins1_ui_bundle_observe.dag
@@ -19,7 +19,7 @@ import gunbc.machine_intake_mtcollins1_fan_observe { FanCredentialPathReady, Fan
 import gunbc.machine_intake_megarac_media_attach { megarac_media_read_max_time, megarac_media_read_max_time_operand }
 import std.measure { Second, second, second_count }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { any }
 import gunbc.machine_intake_megarac_served_ui_catalog_observation { megarac_source_min_js_sha256_2026_09_27 }
 
diff --git a/dag/gunbc/machine_intake/mtjade1_access_observation.dag b/dag/gunbc/machine_intake/mtjade1_access_observation.dag
index 69471660010..e32ab3ee938 100644
--- a/dag/gunbc/machine_intake/mtjade1_access_observation.dag
+++ b/dag/gunbc/machine_intake/mtjade1_access_observation.dag
@@ -36,7 +36,7 @@ import extdeps.languages.json.parse {
   json_field_string,
   json_field_value,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.machine_intake_bmc_firmware_family_discriminator {
   ManagerIdentityObservation,
   discriminate_family,
diff --git a/dag/gunbc/namecheap/federation.dag b/dag/gunbc/namecheap/federation.dag
index 30d50790d66..fe681c4bcca 100644
--- a/dag/gunbc/namecheap/federation.dag
+++ b/dag/gunbc/namecheap/federation.dag
@@ -1,7 +1,7 @@
 module gunbc.namecheap.federation
 
 import std.types { String, NonEmptyStr, List, Map }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.cloud.gcp.gcp { ServiceAccountEmail, WifProvider, wif_provider_resource, wif_pool_resource }
 import gunbc.auth.github_gcp_federation { fleet_secrets_project_number, github_wif_issuer_uri, federated_service_account_member }
 import gunbc.auth.oidc_claim_pins { OidcClaimPin, claim_pins_attribute_condition, fleet_converge_job_claim_pins }
diff --git a/dag/gunbc/namespace/namespace_reference_derived_residency_qualification.dag b/dag/gunbc/namespace/namespace_reference_derived_residency_qualification.dag
index a5e92bf128c..313229edb22 100644
--- a/dag/gunbc/namespace/namespace_reference_derived_residency_qualification.dag
+++ b/dag/gunbc/namespace/namespace_reference_derived_residency_qualification.dag
@@ -3,7 +3,7 @@ module gunbc.namespace_reference_derived_residency_qualification
 import std.types { Bool, List }
 import v2.std.node { Symbol }
 import std.decl_ref { DeclarationRef, decl_ref }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 
 // THE EVIDENCE TYPE FOR THE CONSUMPTION SIDE of
 // gunbc.recurring_failure_mode.semantic_independence_consumed_as_resource_independence, which is the
diff --git a/dag/gunbc/namespace/namespace_xl2_rehearsal_census.dag b/dag/gunbc/namespace/namespace_xl2_rehearsal_census.dag
index b711d044a8f..ed9589d41aa 100644
--- a/dag/gunbc/namespace/namespace_xl2_rehearsal_census.dag
+++ b/dag/gunbc/namespace/namespace_xl2_rehearsal_census.dag
@@ -38,7 +38,7 @@ import v2.std.diagnostic { Accepted, NonEmptyDiagnostics, Rejected }
 import v2.compiler.resolve { ObservationComplete, ObservationCompleteness, ObservationIncomplete }
 import v2.std.node { Symbol, symbol_intern_lexeme }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.algebra { fold_list }
 import std.algebra { Cons, Empty }
 import gunbc.compiler_frontend_program_status { Xl2Prerequisite, xl2_prerequisites_outstanding }
diff --git a/dag/gunbc/native_frontier_ratchet.dag b/dag/gunbc/native_frontier_ratchet.dag
index d6b84a08dd7..6e0845c16da 100644
--- a/dag/gunbc/native_frontier_ratchet.dag
+++ b/dag/gunbc/native_frontier_ratchet.dag
@@ -6,7 +6,7 @@ import v2.std.algebra { any, filter, fold_list, is_empty, length, list_flat_map,
 import std.algebra { list_append }
 import v2.std.collection { Map, map_lookup }
 import v2.std.integer { Int, integer_int_to_decimal_string }
-import v2.std.optional { Optional, Present, Absent, optional_present, optional_absent }
+import std.optional { Optional, Present, Absent, optional_present, optional_absent }
 import extdeps.bazel.target_pattern { TargetPattern, target_pattern_within }
 import v2.compiler.native_test_vocabulary {
   NativeTestVerdict, NativeTestPassed, NativeTestReturnedFalse, NativeTestReturnedOther, NativeTestRefused,
diff --git a/dag/gunbc/native_route_progress_guard.dag b/dag/gunbc/native_route_progress_guard.dag
index a51bcc1a5e4..6deee023be0 100644
--- a/dag/gunbc/native_route_progress_guard.dag
+++ b/dag/gunbc/native_route_progress_guard.dag
@@ -5,7 +5,7 @@ import v2.std.algebra { any, count_where, fold_list, is_empty, length, list_flat
 import std.algebra { list_append }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
 import v2.std.integer { Int }
-import v2.std.optional { Optional, Present, Absent, optional_present, optional_absent }
+import std.optional { Optional, Present, Absent, optional_present, optional_absent }
 import v2.compiler.native_test_vocabulary {
   NativeTestStage, NativeTestStagePrepare, NativeTestStageContext, NativeTestStageEntry, NativeTestStageEval
 }
diff --git a/dag/gunbc/native_scm_interaction_contract.dag b/dag/gunbc/native_scm_interaction_contract.dag
index c74d74e46f1..54726ef246d 100644
--- a/dag/gunbc/native_scm_interaction_contract.dag
+++ b/dag/gunbc/native_scm_interaction_contract.dag
@@ -2,7 +2,7 @@ module gunbc.native_scm_interaction_contract
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.integer { NonNegativeInt }
-import v2.std.optional { Optional, Present, Absent, optional_present, optional_absent }
+import std.optional { Optional, Present, Absent, optional_present, optional_absent }
 import v2.std.collection { list_at_optional }
 import gunbc.scm_compatibility_shape {
   CompatibilityProjectionReceipt,
diff --git a/dag/gunbc/owned_process.dag b/dag/gunbc/owned_process.dag
index 491bba2724f..68fe7a2bc9d 100644
--- a/dag/gunbc/owned_process.dag
+++ b/dag/gunbc/owned_process.dag
@@ -5,7 +5,7 @@ import std.algebra { trim }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import std.disposition { Disposition, Scaffold, SingleAuthority }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.linux.proc_pid_stat { ProcPidStatStartTime, StartTimeObserved, proc_pid_stat_start_time }
diff --git a/dag/gunbc/process_hold_identity.dag b/dag/gunbc/process_hold_identity.dag
index 5aed7587314..b24d75cdf40 100644
--- a/dag/gunbc/process_hold_identity.dag
+++ b/dag/gunbc/process_hold_identity.dag
@@ -1,7 +1,7 @@
 module gunbc.process_hold_identity
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.checked_arithmetic { checked_int_to_nat }
 import std.algebra { trim }
 import std.durable_exclusive_hold { DurableHoldHolderLiveness, HolderObservedLive, HolderObservedDead, HolderLivenessUnobservable }
diff --git a/dag/gunbc/product/capacity/event_json.dag b/dag/gunbc/product/capacity/event_json.dag
index 96fd2357252..1efbffb0e97 100644
--- a/dag/gunbc/product/capacity/event_json.dag
+++ b/dag/gunbc/product/capacity/event_json.dag
@@ -2,7 +2,7 @@ module product.capacity.event_json
 
 import std.types { String, NonEmptyStr, List }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.languages.json.emit { JsonValue, JsonString, JsonNumber, JsonKeyValue, json_object, json_kv, json_string, json_int, serialize_json }
 import extdeps.languages.json.parse {
   parse_json_document, JsonDocumentParsed, JsonDocumentUnreadable, json_document_gap_text,
diff --git a/dag/gunbc/product/capacity/redemption.dag b/dag/gunbc/product/capacity/redemption.dag
index 39f31fe6940..8bafdc60ef7 100644
--- a/dag/gunbc/product/capacity/redemption.dag
+++ b/dag/gunbc/product/capacity/redemption.dag
@@ -2,7 +2,7 @@ module product.capacity.redemption
 
 import std.types { String, Bool, NonEmptyStr, List, EpochSecs }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.languages.json.emit { JsonValue, JsonKeyValue, json_kv, json_string }
 import product.capacity.event_json { chain_event_wire_text, chain_event_decode, member_nonempty }
 import product.capacity.event_chain {
diff --git a/dag/gunbc/product/compute_board/truth_table_projection.dag b/dag/gunbc/product/compute_board/truth_table_projection.dag
index 0d7cbb65856..c4434390f0f 100644
--- a/dag/gunbc/product/compute_board/truth_table_projection.dag
+++ b/dag/gunbc/product/compute_board/truth_table_projection.dag
@@ -31,7 +31,7 @@ import std.markdown {
   TextInline,
 }
 import extdeps.languages.markdown { commonmark_gfm_spellings, md_table }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // A THIRD TARGET FOR THE SAME DIGITAL INTENT, ADDED AS ONE PROJECTION AND NOT AS A CONVERTER. The
 // point of this module is what it does NOT contain: there is no Verilog-to-Markdown path, no
diff --git a/dag/gunbc/product/fabric/capacity_admission.dag b/dag/gunbc/product/fabric/capacity_admission.dag
index e51ee615c52..a4bba4d2609 100644
--- a/dag/gunbc/product/fabric/capacity_admission.dag
+++ b/dag/gunbc/product/fabric/capacity_admission.dag
@@ -2,7 +2,7 @@ module product.fabric.capacity_admission
 
 import std.types { List, EpochSecs }
 import std.decl_ref { DeclarationRef }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.fabric.identity { FabricIdentity, OfferKey, WorkKey, DemandKey, fabric_identity_eq }
 import product.fabric.work { ExecutionRequirements }
 import product.fabric.provider_route { ProviderRoute, ProviderRouteFacts, CompliancePostureRevision }
diff --git a/dag/gunbc/product/fabric/failure_scenario_admission.dag b/dag/gunbc/product/fabric/failure_scenario_admission.dag
index 0de1cc9114d..5d5cda460a5 100644
--- a/dag/gunbc/product/fabric/failure_scenario_admission.dag
+++ b/dag/gunbc/product/fabric/failure_scenario_admission.dag
@@ -1,7 +1,7 @@
 module product.fabric.failure_scenario_admission
 
 import std.types { Bool, Int, List, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.list { distinct_by_key, duplicated_by_key }
 import std.decl_ref { DeclarationRef, declaration_ref_eq }
 import product.fabric.identity { FabricIdentity, OfferKey, WorkKey, DemandKey, fabric_identity_eq }
diff --git a/dag/gunbc/product/fabric/job_admission.dag b/dag/gunbc/product/fabric/job_admission.dag
index 773bdaff9f7..c16ab89a3ad 100644
--- a/dag/gunbc/product/fabric/job_admission.dag
+++ b/dag/gunbc/product/fabric/job_admission.dag
@@ -4,7 +4,7 @@ import std.types { List }
 import std.roster_frontier { FrontierRow, frontier_row_decl }
 import std.decl_ref { decl_ref }
 import std.dissolution { unbound_dissolution }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.fabric.identity { FabricIdentity, WorkKey, fabric_identity_eq }
 
 // Customer declaration admission precedes provider-route selection. This is a
diff --git a/dag/gunbc/product/rack_mount.dag b/dag/gunbc/product/rack_mount.dag
index e0704120e84..482453b02b7 100644
--- a/dag/gunbc/product/rack_mount.dag
+++ b/dag/gunbc/product/rack_mount.dag
@@ -6,7 +6,7 @@ import std.measure { Micrometer, micrometer, micrometer_count, RackUnit, rack_un
 import product.placement_supply { RackIdentity, PhysicalAssetIdentity, RackUnitPosition }
 import extdeps.rack.types { RackCatalogRow }
 import extdeps.chassis.types { ChassisCatalogRow }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // SPATIAL-4B: RACK-UNIT OCCUPANCY OVER CITED HARDWARE. A chassis from extdeps.chassis occupying
 // rack units in a rack from extdeps.rack. Every dimension below is either a cited vendor fact or
diff --git a/dag/gunbc/product/rack_power.dag b/dag/gunbc/product/rack_power.dag
index 91cc007d07a..3de05ea50f8 100644
--- a/dag/gunbc/product/rack_power.dag
+++ b/dag/gunbc/product/rack_power.dag
@@ -9,7 +9,7 @@ import std.measure {
 import product.placement_supply { PhysicalAssetIdentity }
 import product.rack_mount { RackInstance, ChassisMount, rack_mounts }
 import extdeps.power.types { PduCatalogRow }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // SPATIAL-6A: WHAT THE RACK DRAWS, AND WHETHER THE FEED CAN CARRY IT.
 //
diff --git a/dag/gunbc/product/spatial_connectivity.dag b/dag/gunbc/product/spatial_connectivity.dag
index 00cae1f767c..2d2c01baa01 100644
--- a/dag/gunbc/product/spatial_connectivity.dag
+++ b/dag/gunbc/product/spatial_connectivity.dag
@@ -9,7 +9,7 @@ import std.orthogonal_topology {
 }
 import product.placement_supply { RoomIdentity }
 import product.spatial_world { World, PlacedSpace, world_rooms }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // SPATIAL-4C: OPENINGS, AND WHAT THEY MAKE REACHABLE.
 //
diff --git a/dag/gunbc/product/spatial_edit.dag b/dag/gunbc/product/spatial_edit.dag
index b91e5e0c586..f34e050fc99 100644
--- a/dag/gunbc/product/spatial_edit.dag
+++ b/dag/gunbc/product/spatial_edit.dag
@@ -20,7 +20,7 @@ import product.spatial_world {
   World, PlacedSpace, world_rooms, WorldVariant, world_variant,
   WorldConstruction, WorldReady, WorldRefused, realize_variant,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // SPATIAL-5B: EDITING, AND EVERY EDIT IS A DELTA BY CONSTRUCTION.
 //
diff --git a/dag/gunbc/product/spatial_projection.dag b/dag/gunbc/product/spatial_projection.dag
index a9de409df63..652e4c03a9f 100644
--- a/dag/gunbc/product/spatial_projection.dag
+++ b/dag/gunbc/product/spatial_projection.dag
@@ -14,7 +14,7 @@ import std.planar_projection {
 }
 import product.placement_supply { RoomIdentity }
 import product.spatial_world { World, PlacedSpace, world_rooms }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { Cons, Empty }
 
 // SPATIAL-5A CONSUMER: A WORLD, SEEN. This is the read-only half of the projection band - it takes
diff --git a/dag/gunbc/product/spatial_world.dag b/dag/gunbc/product/spatial_world.dag
index 9d99bf4ab49..79790bb8421 100644
--- a/dag/gunbc/product/spatial_world.dag
+++ b/dag/gunbc/product/spatial_world.dag
@@ -13,7 +13,7 @@ import std.orthogonal_topology {
   SpaceComplex, space_complex, complex_total_volume,
 }
 import product.placement_supply { RoomIdentity }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.spatial_frame { SpatialFrameRegistry }
 import std.algebra { Cons, Empty }
 
diff --git a/dag/gunbc/prose_row_frontier.dag b/dag/gunbc/prose_row_frontier.dag
index 4a57e73caee..c5cd5c8e7fd 100644
--- a/dag/gunbc/prose_row_frontier.dag
+++ b/dag/gunbc/prose_row_frontier.dag
@@ -1,7 +1,7 @@
 module gunbc.prose_row_frontier
 
 import std.types { Bool, Int, String, List }
-import v2.std.optional { Optional }
+import std.optional { Optional }
 
 // DESIGN 4c rules that unclassified prose is forbidden and that `//` is the quarantine boundary, so a
 // prose-only `data NAME_note: String` row is debt in a representation no lens can classify. The wall
diff --git a/dag/gunbc/provider_standing.dag b/dag/gunbc/provider_standing.dag
index 8080dad9ad5..fc3b3a5ea8f 100644
--- a/dag/gunbc/provider_standing.dag
+++ b/dag/gunbc/provider_standing.dag
@@ -3,7 +3,7 @@ module gunbc.provider_standing
 import std.types { String, NonEmptyStr, Bool, Int, List, list_length, EpochSecs }
 import std.claim_evidence { RecordedFactId, RecordedFact }
 import std.measure { BasisPoint }
-import v2.std.optional { optional_absent, optional_present }
+import std.optional { optional_absent, optional_present }
 import extdeps.llm.cli_lifecycle {
   ProviderInstance,
   ProviderInstanceFieldUnobserved,
diff --git a/dag/gunbc/provisioning/seeded_install_media_publish.dag b/dag/gunbc/provisioning/seeded_install_media_publish.dag
index 5f6412f4186..0bdd782e962 100644
--- a/dag/gunbc/provisioning/seeded_install_media_publish.dag
+++ b/dag/gunbc/provisioning/seeded_install_media_publish.dag
@@ -2,7 +2,7 @@ module gunbc.seeded_install_media_publish
 
 import std.types { NonEmptyStr, String }
 import std.algebra { trim }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.tools.sha256sum { Sha256FileDigest, Sha256FileDigestUnavailable }
 import extdeps.tools.gnu_coreutils { cat_command }
 import extdeps.posix.test_utility { test_regular_file_command }
diff --git a/dag/gunbc/quarantine_probe_disposition.dag b/dag/gunbc/quarantine_probe_disposition.dag
index a0668160e7b..3924178bc24 100644
--- a/dag/gunbc/quarantine_probe_disposition.dag
+++ b/dag/gunbc/quarantine_probe_disposition.dag
@@ -4,7 +4,7 @@ import gunbc.explicit_witness_admission { ExplicitWitnessAdmission }
 import std.witness_admission { WitnessConsumerCadence, QuarantineProbeExpectRed }
 import v2.std.algebra { Cons, Empty, fold_list }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 import std.types { NonEmptyStr, List }
 import gunbc.quarantine_outside_gate_decline { QuarantineOutsideGateDecline }
diff --git a/dag/gunbc/recurring_failure_mode/none_literal_is_a_second_spelling_of_absent.dag b/dag/gunbc/recurring_failure_mode/none_literal_is_a_second_spelling_of_absent.dag
index f4200e971a9..86d90b4aa59 100644
--- a/dag/gunbc/recurring_failure_mode/none_literal_is_a_second_spelling_of_absent.dag
+++ b/dag/gunbc/recurring_failure_mode/none_literal_is_a_second_spelling_of_absent.dag
@@ -22,6 +22,6 @@ data none_literal_is_a_second_spelling_of_absent: RecurringFailureMode = Recurri
   ],
 
   evidence: [
-    DeclarationRef { module_path: "v2.std.optional", decl_name: "Optional", field: WholeDeclaration },
+    DeclarationRef { module_path: "std.optional", decl_name: "Optional", field: WholeDeclaration },
   ],
 }
diff --git a/dag/gunbc/repo/repo_atlas_projection.dag b/dag/gunbc/repo/repo_atlas_projection.dag
index 27156a409ae..718206ac591 100644
--- a/dag/gunbc/repo/repo_atlas_projection.dag
+++ b/dag/gunbc/repo/repo_atlas_projection.dag
@@ -3,7 +3,7 @@ module gunbc.repo_atlas_projection
 import std.content_hash { content_hash_atom }
 import v2.lens.module_graph { ModuleDeclarationFact, map_lookup_where_rejected_unreachable }
 import v2.std.collection { Map, empty_map, map_insert }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.lens.module_impact_query {
   ModuleIdentity,
   ImpactReading,
diff --git a/dag/gunbc/required_lane_resolution_census.dag b/dag/gunbc/required_lane_resolution_census.dag
index 59c14fd7a69..fd750edd049 100644
--- a/dag/gunbc/required_lane_resolution_census.dag
+++ b/dag/gunbc/required_lane_resolution_census.dag
@@ -1,7 +1,7 @@
 module gunbc.required_lane_resolution_census
 
 import std.types { String, Bool, List, Int }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import extdeps.languages.json.emit { serialize_json_string }
 
 // FOR EVERY MODULE UNDER THE SOURCE ROOTS, DOES AT LEAST ONE REQUIRED LANE RESOLVE IT?
diff --git a/dag/gunbc/required_lane_resolution_census_live.dag b/dag/gunbc/required_lane_resolution_census_live.dag
index 617150cde4f..5787b001471 100644
--- a/dag/gunbc/required_lane_resolution_census_live.dag
+++ b/dag/gunbc/required_lane_resolution_census_live.dag
@@ -1,7 +1,7 @@
 module gunbc.required_lane_resolution_census_live
 
 import std.types { String, Bool, List, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, ExitSuccess, ExitFailure }
 import gunbc.cli_wire { CliWireResponse, CliWirePrintable }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
diff --git a/dag/gunbc/roadmap/roadmap_attempt_metering.dag b/dag/gunbc/roadmap/roadmap_attempt_metering.dag
index 775042d0b96..0851881b8db 100644
--- a/dag/gunbc/roadmap/roadmap_attempt_metering.dag
+++ b/dag/gunbc/roadmap/roadmap_attempt_metering.dag
@@ -6,7 +6,7 @@ import std.types { path_segment_is_safe }
 import std.content_hash { content_hash_tagged_structural, content_hash_atom }
 import std.measure { Second, second, second_count, TokenCount, token_count, token_count_value }
 import std.checked_arithmetic { checked_int_to_nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.languages.json.emit {
   JsonValue, JsonNull, JsonBool, JsonNumber, JsonString, JsonArray, JsonObject, JsonKeyValue,
   json_kv, json_int, json_string, json_object, json_array, serialize_json,
diff --git a/dag/gunbc/roadmap/roadmap_dispatch_actuator.dag b/dag/gunbc/roadmap/roadmap_dispatch_actuator.dag
index 34e00e3a6fa..0e3d0009818 100644
--- a/dag/gunbc/roadmap/roadmap_dispatch_actuator.dag
+++ b/dag/gunbc/roadmap/roadmap_dispatch_actuator.dag
@@ -2,7 +2,7 @@ module gunbc.roadmap_dispatch_actuator
 
 import extdeps.tools.env { env_path_resolved_program }
 import std.types { String, NonEmptyStr, Int, Bool, List, FilePath, GitRef }
-import v2.std.optional { Present }
+import std.optional { Present }
 import std.content_hash { content_hash_atom }
 import std.upsert_decision {
   ObservationVerdict,
diff --git a/dag/gunbc/roadmap/roadmap_repo_atlas_sandbox.dag b/dag/gunbc/roadmap/roadmap_repo_atlas_sandbox.dag
index 2db2a30bdc1..be15bf132f7 100644
--- a/dag/gunbc/roadmap/roadmap_repo_atlas_sandbox.dag
+++ b/dag/gunbc/roadmap/roadmap_repo_atlas_sandbox.dag
@@ -58,7 +58,7 @@ import extdeps.git {
   GitDiffNameStatusComplete, git_diff_name_status_parse, GitDiffRange, TwoDot, ThreeDot
 }
 import extdeps.git.object_store { GitObjectId, GitSha1ObjectId, GitSha256ObjectId, git_sha1_object_id }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.lens.module_impact_query {
   ModuleIdentity,
   ImpactStanding,
diff --git a/dag/gunbc/runner/runner_attempt_launch.dag b/dag/gunbc/runner/runner_attempt_launch.dag
index b3e4010187e..653d94c7810 100644
--- a/dag/gunbc/runner/runner_attempt_launch.dag
+++ b/dag/gunbc/runner/runner_attempt_launch.dag
@@ -1,7 +1,7 @@
 module gunbc.runner_attempt_launch
 
 import std.types { String, NonEmptyStr, Bool, Int, List, FilePath }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.algebra { trim }
 import std.disposition { ConstructionMechanism, SingleAuthority }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
diff --git a/dag/gunbc/runner/runner_browser_toolchain.dag b/dag/gunbc/runner/runner_browser_toolchain.dag
index d5ab4dd239e..6d989d45e8a 100644
--- a/dag/gunbc/runner/runner_browser_toolchain.dag
+++ b/dag/gunbc/runner/runner_browser_toolchain.dag
@@ -6,7 +6,7 @@ import extdeps.posix.test_utility { test_exists_command }
 import std.measure { ByteSize, byte_size }
 import std.algebra { Cons, Empty, list_append, trim }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.orchestration { EnvBinding, EnvSet }
 import extdeps.exec.command { ArgvCommand, env_prefixed_command_in, env_cleared_command_in }
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/gunbc/runner/runner_microvm_lifecycle.dag b/dag/gunbc/runner/runner_microvm_lifecycle.dag
index 430f0909f14..d6ead70edb0 100644
--- a/dag/gunbc/runner/runner_microvm_lifecycle.dag
+++ b/dag/gunbc/runner/runner_microvm_lifecycle.dag
@@ -1,7 +1,7 @@
 module gunbc.runner_microvm_lifecycle
 
 import std.types { String, NonEmptyStr, Bool, List, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.disposition { ConstructionMechanism, SingleAuthority }
 import product.fabric.sanitation {
   CellId, SandboxId, CellReadiness, SanitationFact, SanitationReadback, SanitationObservation,
diff --git a/dag/gunbc/runner/runner_microvm_shakedown_workflow.dag b/dag/gunbc/runner/runner_microvm_shakedown_workflow.dag
index b9033857297..c3a2b38fb4f 100644
--- a/dag/gunbc/runner/runner_microvm_shakedown_workflow.dag
+++ b/dag/gunbc/runner/runner_microvm_shakedown_workflow.dag
@@ -22,7 +22,7 @@ import gunbc.toolchain_home_standing {
   admit_workflow_toolchain_homes, WorkflowToolchainHomesAdmitted, WorkflowToolchainHomeRefused,
   toolchain_home_refusal_reason,
 }
-import v2.std.optional { Present }
+import std.optional { Present }
 import v2.std.node { Node }
 import v2.std.diagnostic { Outcome, Accepted, Rejected }
 import v2.workflow.bash_emit { bash_emit_stmts }
diff --git a/dag/gunbc/runner/runner_microvm_slot_reserve.dag b/dag/gunbc/runner/runner_microvm_slot_reserve.dag
index 7c68972f44c..87d0c0fc745 100644
--- a/dag/gunbc/runner/runner_microvm_slot_reserve.dag
+++ b/dag/gunbc/runner/runner_microvm_slot_reserve.dag
@@ -5,7 +5,7 @@ import std.measure { money_amount_micro, MoneyPerSecond, MoneyOnce, second }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.decl_ref { decl_ref }
 import std.content_hash { as_content_hash_structural, content_hash_atom }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.fabric.provider_route {
   ProviderRouteFacts, ProviderDataPathClosure, ProviderPathStanding, ProviderPathLocated,
   DownstreamProvidersEnumerated,
diff --git a/dag/gunbc/runner/runner_password_session_tool_converge.dag b/dag/gunbc/runner/runner_password_session_tool_converge.dag
index 6bc9d64ee74..78fce5ddfc4 100644
--- a/dag/gunbc/runner/runner_password_session_tool_converge.dag
+++ b/dag/gunbc/runner/runner_password_session_tool_converge.dag
@@ -1,7 +1,7 @@
 module gunbc.runner_password_session_tool_converge
 
 import std.types { Bool, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.tools { CliTool, apt_package_of }
 import gunbc.host_cli_dependency { password_session_host_cli_requirements }
 import gunbc.host_effect { HostEffectTransport, FleetSsh }
diff --git a/dag/gunbc/runner/runner_qemu_host_standing.dag b/dag/gunbc/runner/runner_qemu_host_standing.dag
index c68187d8dcd..a94945a79bd 100644
--- a/dag/gunbc/runner/runner_qemu_host_standing.dag
+++ b/dag/gunbc/runner/runner_qemu_host_standing.dag
@@ -2,7 +2,7 @@ module gunbc.runner_qemu_host_standing
 
 import std.types { Bool, List, NonEmptyStr, String, FilePath }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.posix.test_utility { test_exists_command, test_writable_command, test_executable_command }
 import extdeps.tools.sha256sum { Sha256FileDigest, Sha256FileDigestUnavailable, sha256sum_file_digest_via_shell }
 import extdeps.virtualization.qemu {
diff --git a/dag/gunbc/runner/runner_qemu_toolchain.dag b/dag/gunbc/runner/runner_qemu_toolchain.dag
index 8e81ae1736f..92e2ed97778 100644
--- a/dag/gunbc/runner/runner_qemu_toolchain.dag
+++ b/dag/gunbc/runner/runner_qemu_toolchain.dag
@@ -4,7 +4,7 @@ import std.types { Bool, List, NonEmptyStr, FilePath }
 import std.algebra { list_append, trim }
 import std.content_hash { content_hash_atom }
 import v2.std.orchestration { EnvBinding, EnvSet }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.shell
 import extdeps.exec.command { ArgvCommand, env_cleared_command_in }
 import extdeps.os.ubuntu_ports_archive { UbuntuArchiveBinaryPackage, ubuntu_ports_package_url }
diff --git a/dag/gunbc/runner/runner_teardown_receipt.dag b/dag/gunbc/runner/runner_teardown_receipt.dag
index 4e87cb3657c..1ee500b89d5 100644
--- a/dag/gunbc/runner/runner_teardown_receipt.dag
+++ b/dag/gunbc/runner/runner_teardown_receipt.dag
@@ -1,6 +1,6 @@
 module gunbc.runner.runner_teardown_receipt
 
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import std.types { Bool, List, NonEmptyStr, String }
 import std.measure { ObservationInstant }
 import std.decl_ref { declaration_ref_eq }
diff --git a/dag/gunbc/runner/runner_usage_receipt.dag b/dag/gunbc/runner/runner_usage_receipt.dag
index 121a1c21c07..05719b0a182 100644
--- a/dag/gunbc/runner/runner_usage_receipt.dag
+++ b/dag/gunbc/runner/runner_usage_receipt.dag
@@ -1,7 +1,7 @@
 module gunbc.runner.runner_usage_receipt
 
 import std.types { Bool, NonEmptyStr, String, List }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import std.nat { Nat }
 import std.algebra { FieldOfFractions }
 import std.measure {
diff --git a/dag/gunbc/runner/workspace_microvm.dag b/dag/gunbc/runner/workspace_microvm.dag
index 8449acfe849..a2e1b7581db 100644
--- a/dag/gunbc/runner/workspace_microvm.dag
+++ b/dag/gunbc/runner/workspace_microvm.dag
@@ -2,7 +2,7 @@ module gunbc.workspace_microvm
 
 import gunbc.workspace_allocation_admission { WorkspaceAuthorizationPolicy, workspace_owner_enrollment }
 import extdeps.ssh { ssh_public_key_line }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.types { String, NonEmptyStr, Int, Bool, FilePath, List }
 import std.algebra { trim }
 import std.resources { Filesystem }
diff --git a/dag/gunbc/rust_crate_package_ident.dag b/dag/gunbc/rust_crate_package_ident.dag
index 6b06a67851f..ddbca28375c 100644
--- a/dag/gunbc/rust_crate_package_ident.dag
+++ b/dag/gunbc/rust_crate_package_ident.dag
@@ -1,4 +1,5 @@
 module gunbc.rust_crate_package_ident
+import std.optional { Absent, Optional, Present }
 
 import std.types { List, String, Bool, NonEmptyStr }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
diff --git a/dag/gunbc/scm_compatibility/pijul.dag b/dag/gunbc/scm_compatibility/pijul.dag
index 294890e195b..ebf3d12dc79 100644
--- a/dag/gunbc/scm_compatibility/pijul.dag
+++ b/dag/gunbc/scm_compatibility/pijul.dag
@@ -4,7 +4,7 @@ import std.types { Bytes, List, NonEmptyStr, String }
 import std.content_hash { Fnv1a64Structural }
 import std.integer { UInt8 }
 import std.bytes { bytes_octets }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.pijul {
   PijulUpstreamVersion,
   PijulChangeHash,
diff --git a/dag/gunbc/self_host_behavioral_equivalence_receipt.dag b/dag/gunbc/self_host_behavioral_equivalence_receipt.dag
index 9b4511f6252..e1af10b4b63 100644
--- a/dag/gunbc/self_host_behavioral_equivalence_receipt.dag
+++ b/dag/gunbc/self_host_behavioral_equivalence_receipt.dag
@@ -2,7 +2,7 @@ module gunbc.self_host_behavioral_equivalence_receipt
 
 import std.types { Bool, Int, String, NonEmptyStr, CommitSha }
 import v2.std.algebra { filter, any }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.bazel.label { render_label }
 import gunbc.instrument_targets { self_host_behavioral_equivalence_label }
diff --git a/dag/gunbc/serving/engine_progress.dag b/dag/gunbc/serving/engine_progress.dag
index ed6700ff60f..43d4536ee9d 100644
--- a/dag/gunbc/serving/engine_progress.dag
+++ b/dag/gunbc/serving/engine_progress.dag
@@ -4,7 +4,7 @@ import std.types { String, Bool, NonEmptyStr, Timestamp, EpochSecs }
 import std.nat { Nat }
 import std.checked_arithmetic { CheckedNatReady, CheckedNatOverflow, checked_int_magnitude }
 import std.measure { Second, second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.fabric.demand { ObservationReceiptRef }
 import gunbc.serving.serving_enrollment { ServingRouteEndpoint, serving_route_endpoint_wire }
 import gunbc.serving.serving_availability {
diff --git a/dag/gunbc/serving/serving_enrollment.dag b/dag/gunbc/serving/serving_enrollment.dag
index dcd1eec57ac..b6eea5b81bd 100644
--- a/dag/gunbc/serving/serving_enrollment.dag
+++ b/dag/gunbc/serving/serving_enrollment.dag
@@ -2,7 +2,7 @@ module gunbc.serving.serving_enrollment
 
 import std.types { String, NonEmptyStr, List, Port }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import gunbc.fleet_intent_network { host_lan_address }
 import gunbc.spark.fabric_switch_observed { FabricGroup, FabricGroupA, FabricGroupB, fabric_group_wire }
diff --git a/dag/gunbc/serving/serving_front_door.dag b/dag/gunbc/serving/serving_front_door.dag
index b54125ace03..e5d32d6c44f 100644
--- a/dag/gunbc/serving/serving_front_door.dag
+++ b/dag/gunbc/serving/serving_front_door.dag
@@ -3,7 +3,7 @@ module gunbc.serving.serving_front_door
 import std.types { String, Bool, NonEmptyStr, List, EpochSecs }
 import std.nat { Nat }
 import std.measure { Second, second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.crypto.mac {
   MacKey, MacKeyId, MacSuite, HmacSha256, MacVerification, MacVerified, MacTagMismatch, MacKeyUnknown,
   MacKeyRetired, MacSuiteMismatch, MacTagMalformed, MacSigned, MacKeyMaterialNotHex,
diff --git a/dag/gunbc/source_integration_landing_spine.dag b/dag/gunbc/source_integration_landing_spine.dag
index 05753566623..7f634386690 100644
--- a/dag/gunbc/source_integration_landing_spine.dag
+++ b/dag/gunbc/source_integration_landing_spine.dag
@@ -4,7 +4,7 @@ import std.types { Bool, Int, List, NonEmptyStr, String, Timestamp, brand }
 import std.content_hash { ContentHash }
 import std.integer { PositiveInt }
 import std.measure { Minute, minute }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.collection { list_at_optional }
 import v2.std.algebra { list_head, HeadFound, HeadAbsent }
 import std.claim_evidence {
diff --git a/dag/gunbc/source_root_read.dag b/dag/gunbc/source_root_read.dag
index f1dd3c8cb15..dfa7317f24e 100644
--- a/dag/gunbc/source_root_read.dag
+++ b/dag/gunbc/source_root_read.dag
@@ -9,7 +9,7 @@ import extdeps.filesystem.filesystem_io {
   filesystem_listing_observation, filesystem_listing_entry_names, FilesystemDirectoryListed,
   FilesystemDirectoryListingRefused, FilesystemDirectorySubjectRefused
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // Compiler policy over the existing file transport. A failed listing is never an empty
 // directory. Only the host's NotADirectory observation admits a candidate as a file; every
diff --git a/dag/gunbc/spark/arm_group_launch_dispatch.dag b/dag/gunbc/spark/arm_group_launch_dispatch.dag
index f6c73cb0c43..948323ccdf9 100644
--- a/dag/gunbc/spark/arm_group_launch_dispatch.dag
+++ b/dag/gunbc/spark/arm_group_launch_dispatch.dag
@@ -2,7 +2,7 @@ module gunbc.spark.arm_group_launch_dispatch
 
 import product.host_identity { HostIdentity }
 import std.types { String, List, NonEmptyStr, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, exit_failure }
 import gunbc.fleet_multi_principal_probe { env_var_nonempty }
 import gunbc.spark.group_arm_launch { ArmDryPlan, ArmWetSession, group_arm_dry_plan_write, group_arm_launch_wet, group_arm_occupancy_observe_session }
diff --git a/dag/gunbc/spark/arm_memory_experiment_observed.dag b/dag/gunbc/spark/arm_memory_experiment_observed.dag
index 4681fc76baf..dac9e00b3f6 100644
--- a/dag/gunbc/spark/arm_memory_experiment_observed.dag
+++ b/dag/gunbc/spark/arm_memory_experiment_observed.dag
@@ -10,7 +10,7 @@ import std.measure {
   AllocatorBlockCount,
   gibibyte_scale_factor_bytes, concurrent_request_hundredths, basis_point,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.runtime_defaults { Vllm8d09804, defaults_source_revision }
 import extdeps.vllm.log_lines {
   VllmStartupReading, vllm_startup_reading, GpuKvCacheSize, MaximumConcurrency,
diff --git a/dag/gunbc/spark/arm_memory_fit.dag b/dag/gunbc/spark/arm_memory_fit.dag
index d7a0d1ead4f..c01b8a542da 100644
--- a/dag/gunbc/spark/arm_memory_fit.dag
+++ b/dag/gunbc/spark/arm_memory_fit.dag
@@ -3,7 +3,7 @@ module gunbc.spark.arm_memory_fit
 import std.types { Bool, Int, String, NonEmptyStr, List }
 import std.algebra { FreeMonoid }
 import std.nat { Nat, nat_range_inclusive }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure {
   ByteSize, byte_size, byte_size_count, measure_add, measure_le,
   Gibibyte, gibibyte, gibibyte_count, gibibyte_to_byte_size,
diff --git a/dag/gunbc/spark/awaited_incarnation.dag b/dag/gunbc/spark/awaited_incarnation.dag
index e976030dcbb..585305d5d95 100644
--- a/dag/gunbc/spark/awaited_incarnation.dag
+++ b/dag/gunbc/spark/awaited_incarnation.dag
@@ -2,7 +2,7 @@ module gunbc.spark.awaited_incarnation
 
 import std.types { String, Bool, List, NonEmptyStr, Int, EpochSecs }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import std.measure { Second }
 
diff --git a/dag/gunbc/spark/deliberate_unit_start.dag b/dag/gunbc/spark/deliberate_unit_start.dag
index 580cff03b8b..db4726f4099 100644
--- a/dag/gunbc/spark/deliberate_unit_start.dag
+++ b/dag/gunbc/spark/deliberate_unit_start.dag
@@ -2,7 +2,7 @@ module gunbc.spark.deliberate_unit_start
 
 import std.types { String, List, NonEmptyStr }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.host_operation_exec { HostOperation, SystemctlShowLoadState, SystemctlResetFailed, SystemctlRestart }
 import gunbc.compute.host_occupancy { host_operation_leg, HostOperationLegRead, HostOperationLegUnread }
 import gunbc.spark.host_effect_quiescence { ArgvRun }
diff --git a/dag/gunbc/spark/execution_cell.dag b/dag/gunbc/spark/execution_cell.dag
index 5c90498618f..4c8145001a1 100644
--- a/dag/gunbc/spark/execution_cell.dag
+++ b/dag/gunbc/spark/execution_cell.dag
@@ -4,7 +4,7 @@ import std.types { Bool, String, NonEmptyStr, List }
 import std.nat { Nat }
 import std.content_hash { ContentHash, content_hash_of_value, serialize_content_hash }
 import std.list { first_duplicate_by_key }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { any, filter, length }
 
 // ── THE EXECUTION-CELL CONTRACT (owner directive 2026-09-25) ─────────────────────────────────────
diff --git a/dag/gunbc/spark/fabric_blob_peer.dag b/dag/gunbc/spark/fabric_blob_peer.dag
index aa717187b99..eb745e3b6d5 100644
--- a/dag/gunbc/spark/fabric_blob_peer.dag
+++ b/dag/gunbc/spark/fabric_blob_peer.dag
@@ -3,7 +3,7 @@ module gunbc.spark.fabric_blob_peer
 import std.types { String, Bool, List, NonEmptyStr }
 import std.nat { Nat }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import extdeps.tools.rsync {
   RsyncReadOnlyModule, rsyncd_conf_text, rsync_daemon_foreground_argv, rsync_daemon_url,
diff --git a/dag/gunbc/spark/fabric_serving_assignment.dag b/dag/gunbc/spark/fabric_serving_assignment.dag
index 0df37a615df..3e6f67fdca2 100644
--- a/dag/gunbc/spark/fabric_serving_assignment.dag
+++ b/dag/gunbc/spark/fabric_serving_assignment.dag
@@ -1,7 +1,7 @@
 module gunbc.spark.fabric_serving_assignment
 
 import std.types { NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import gunbc.spark.fabric_switch_observed { FabricGroup, FabricGroupB }
 import gunbc.spark.serving_arm {
diff --git a/dag/gunbc/spark/first_party_serving.dag b/dag/gunbc/spark/first_party_serving.dag
index 95e7f1989d4..75a3e3ca440 100644
--- a/dag/gunbc/spark/first_party_serving.dag
+++ b/dag/gunbc/spark/first_party_serving.dag
@@ -1,7 +1,7 @@
 module gunbc.spark.first_party_serving
 
 import std.types { NonEmptyStr, List, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.decl_ref { DeclarationRef, decl_ref, decl_field_ref }
 import std.content_hash { as_content_hash_structural, content_hash_atom }
 import product.placement_supply { SiteIdentity }
diff --git a/dag/gunbc/spark/glm53_arm_staircase.dag b/dag/gunbc/spark/glm53_arm_staircase.dag
index 92c66995d32..56569bc9115 100644
--- a/dag/gunbc/spark/glm53_arm_staircase.dag
+++ b/dag/gunbc/spark/glm53_arm_staircase.dag
@@ -3,7 +3,7 @@ module gunbc.spark.glm53_arm_staircase
 import std.types { String, List, NonEmptyStr }
 import std.nat { Nat }
 import std.measure { token_count, basis_point }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.vllm_runtime_image_build { SparkBuildHostWork }
 import gunbc.spark.model_snapshot_materialize { SparkMaterializeContext }
 import gunbc.fleet_known_hosts_anchor { FleetSshExecutionContext }
diff --git a/dag/gunbc/spark/glm53_kvplan_image.dag b/dag/gunbc/spark/glm53_kvplan_image.dag
index 6f468a6e34c..b9f78169de5 100644
--- a/dag/gunbc/spark/glm53_kvplan_image.dag
+++ b/dag/gunbc/spark/glm53_kvplan_image.dag
@@ -4,7 +4,7 @@ import std.types { String, List, NonEmptyStr }
 import extdeps.docker.cli { docker_run_ephemeral_command }
 
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.exec.command { argv_words }
diff --git a/dag/gunbc/spark/glm53_staircase_load.dag b/dag/gunbc/spark/glm53_staircase_load.dag
index f7f54532fed..bfb9edcbcdc 100644
--- a/dag/gunbc/spark/glm53_staircase_load.dag
+++ b/dag/gunbc/spark/glm53_staircase_load.dag
@@ -5,7 +5,7 @@ import extdeps.vllm.environment { vllm_environment_variable_name, VllmFlashinfer
 
 import std.types { String, List, NonEmptyStr }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import extdeps.vllm.kv_layout { AdmissionCostUnestablished }
 import gunbc.spark.fabric_reach { ReachManagementLan, spark_reach_endpoint }
diff --git a/dag/gunbc/spark/glm_group_b_launch.dag b/dag/gunbc/spark/glm_group_b_launch.dag
index a97c6f5d94f..3e39348906a 100644
--- a/dag/gunbc/spark/glm_group_b_launch.dag
+++ b/dag/gunbc/spark/glm_group_b_launch.dag
@@ -16,7 +16,7 @@ import gunbc.spark.serving_arm {
 }
 import gunbc.spark.serving_arm_launch { ArmLaunchPlan, ArmLaunchRefused, plan_arm_launch_under_memory_fit, glm_native_arm_container }
 import gunbc.spark.group_b_serving_capacity { group_b_restoration_executable }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // ── THE ONE CALL SITE THAT SAYS WHAT GROUP B LAUNCHES ─────────────────────────────────────────
 //
diff --git a/dag/gunbc/spark/glm_serving_load.dag b/dag/gunbc/spark/glm_serving_load.dag
index f22e7ec7835..1e5c9c99689 100644
--- a/dag/gunbc/spark/glm_serving_load.dag
+++ b/dag/gunbc/spark/glm_serving_load.dag
@@ -3,7 +3,7 @@ module gunbc.spark.glm_serving_load
 import std.types { NonEmptyStr, String }
 import std.nat { Nat }
 import std.measure { token_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, exit_failure }
 import extdeps.vllm.bench_serve {
   VllmBenchServeRequest, SendAllImmediately, RandomDatasetSpec, OpenaiChat, vllm_bench_serve_request, vllm_bench_backend_route,
diff --git a/dag/gunbc/spark/group_arm_launch.dag b/dag/gunbc/spark/group_arm_launch.dag
index 9e1c6f88fe3..a61c4c1e12a 100644
--- a/dag/gunbc/spark/group_arm_launch.dag
+++ b/dag/gunbc/spark/group_arm_launch.dag
@@ -10,7 +10,7 @@ import gunbc.spark.pair_serving_d0_door { StandingGrantRowStanding, StandingGran
 import extdeps.git
 import gunbc.output_policy { ExpectSuccess }
 import std.types { String, Bool, List, NonEmptyStr, GitRef, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { zip_map }
 import std.measure { Kibibyte, kibibyte, basis_point_count, BasisPoint }
 import std.content_hash { ContentHash, content_hash_equal, serialize_content_hash, content_hash_atom }
diff --git a/dag/gunbc/spark/group_arm_serving_load.dag b/dag/gunbc/spark/group_arm_serving_load.dag
index f9c44e93830..6ce6de4603a 100644
--- a/dag/gunbc/spark/group_arm_serving_load.dag
+++ b/dag/gunbc/spark/group_arm_serving_load.dag
@@ -3,7 +3,7 @@ module gunbc.spark.group_arm_serving_load
 import std.types { String, Bool, List, NonEmptyStr }
 import std.nat { Nat }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash, content_hash_atom }
 import std.measure { token_count_value }
 import gunbc.spark.serving_performance_subject { ServingPerformanceSubject, serving_subject_key }
diff --git a/dag/gunbc/spark/group_b_serving_capacity.dag b/dag/gunbc/spark/group_b_serving_capacity.dag
index 8d2cb6ff862..e4d33b3e1e9 100644
--- a/dag/gunbc/spark/group_b_serving_capacity.dag
+++ b/dag/gunbc/spark/group_b_serving_capacity.dag
@@ -3,7 +3,7 @@ module gunbc.spark.group_b_serving_capacity
 import std.types { NonEmptyStr, Port }
 import std.nat { Nat }
 import std.measure { TokenCount, token_count, BasisPoint, basis_point }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.engine_args {
   VllmPrefixCachingRequest, PrefixCachingExplicit, VllmKvCacheDtypeRequest, KvFp8,
   VllmEngramConfigRequest, EngramConfigOmitted,
diff --git a/dag/gunbc/spark/group_checkpoint_materialize.dag b/dag/gunbc/spark/group_checkpoint_materialize.dag
index 44e384a36ef..6011974b657 100644
--- a/dag/gunbc/spark/group_checkpoint_materialize.dag
+++ b/dag/gunbc/spark/group_checkpoint_materialize.dag
@@ -2,7 +2,7 @@ module gunbc.spark.group_checkpoint_materialize
 
 import std.types { String, NonEmptyStr, Bool, List, Int }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import gunbc.clock_read { clock_now_probed_at, probed_at_word }
 import gunbc.fleet_multi_principal_probe { spark_converge_target_selection, SparkConvergeTargetSingle, SparkConvergeTargetAllObserveOnly, SparkConvergeTargetRefused }
diff --git a/dag/gunbc/spark/group_image_produce.dag b/dag/gunbc/spark/group_image_produce.dag
index 43f373595b7..38d80c9f25a 100644
--- a/dag/gunbc/spark/group_image_produce.dag
+++ b/dag/gunbc/spark/group_image_produce.dag
@@ -6,7 +6,7 @@ import product.host_identity { HostIdentity, host_identity_eq }
 import extdeps.container.oci.digest { render_oci_content_digest_wire }
 import gunbc.spark.host_effect_quiescence { HostEffectResidueSpec }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import gunbc.clock_read { clock_now_probed_at, probed_at_word }
 import gunbc.fleet_known_hosts_anchor { FleetSshExecutionContext, SshTarget }
diff --git a/dag/gunbc/spark/host_commitment.dag b/dag/gunbc/spark/host_commitment.dag
index e2c3cba4660..1ef26ac5557 100644
--- a/dag/gunbc/spark/host_commitment.dag
+++ b/dag/gunbc/spark/host_commitment.dag
@@ -2,7 +2,7 @@ module gunbc.spark.host_commitment
 
 import std.types { Bool, List, String, NonEmptyStr, EpochSecs }
 import std.algebra { FreeMonoid, Empty, Cons, FreeSemigroup }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.decl_ref { declaration_ref_display_key }
 import product.host_identity { HostIdentity, host_identity_eq }
 import gunbc.spark.cell_role {
diff --git a/dag/gunbc/spark/host_effect_quiescence.dag b/dag/gunbc/spark/host_effect_quiescence.dag
index 5507e85da55..524f5469867 100644
--- a/dag/gunbc/spark/host_effect_quiescence.dag
+++ b/dag/gunbc/spark/host_effect_quiescence.dag
@@ -1,7 +1,7 @@
 module gunbc.spark.host_effect_quiescence
 
 import std.types { String, Bool, Int, NonEmptyStr, List, EpochSecs }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import std.algebra { trim }
 import product.host_identity { HostIdentity, host_identity_eq }
diff --git a/dag/gunbc/spark/native_experiment_apply.dag b/dag/gunbc/spark/native_experiment_apply.dag
index 534c4a79c41..4aecafab22d 100644
--- a/dag/gunbc/spark/native_experiment_apply.dag
+++ b/dag/gunbc/spark/native_experiment_apply.dag
@@ -5,7 +5,7 @@ import gunbc.spark.glm_group_b_launch { glm_group_b_deployment_env }
 import std.nat { Nat }
 import std.measure { token_count_value }
 import v2.std.algebra { zip_map }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.resources { Network }
 import std.content_hash { serialize_content_hash }
diff --git a/dag/gunbc/spark/native_serving_apply.dag b/dag/gunbc/spark/native_serving_apply.dag
index 78c73a21238..2b1660dba37 100644
--- a/dag/gunbc/spark/native_serving_apply.dag
+++ b/dag/gunbc/spark/native_serving_apply.dag
@@ -3,7 +3,7 @@ module gunbc.spark.native_serving_apply
 import std.types { String, Bool, List, NonEmptyStr, Secret, FilePath, Port, Int, EpochSecs }
 import std.algebra { trim }
 import v2.std.algebra { zip_map, list_head, list_tail, HeadFound, HeadAbsent, TailFound, TailAbsent }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import product.host_identity { HostIdentity }
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/gunbc/spark/native_serving_realization.dag b/dag/gunbc/spark/native_serving_realization.dag
index a68c12ddc9a..0a89af351e8 100644
--- a/dag/gunbc/spark/native_serving_realization.dag
+++ b/dag/gunbc/spark/native_serving_realization.dag
@@ -2,7 +2,7 @@ module gunbc.spark.native_serving_realization
 
 import std.types { String, Bool, List, NonEmptyStr }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { zip_map }
 import product.host_identity { HostIdentity }
 import extdeps.network.ipv4 { Ipv4Address, render_ipv4_address }
diff --git a/dag/gunbc/spark/pair_incumbent_identity.dag b/dag/gunbc/spark/pair_incumbent_identity.dag
index a517ba8b5cc..e17cae639d3 100644
--- a/dag/gunbc/spark/pair_incumbent_identity.dag
+++ b/dag/gunbc/spark/pair_incumbent_identity.dag
@@ -1,7 +1,7 @@
 module gunbc.spark.pair_incumbent_identity
 
 import std.types { String, Bool, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash {
   ContentHash, Fnv1a64Structural,
   content_hash_atom, content_hash_combine_structural, content_hash_tagged, serialize_content_hash,
diff --git a/dag/gunbc/spark/pair_serving_apply.dag b/dag/gunbc/spark/pair_serving_apply.dag
index 4ebe43e47d9..e30097d9ead 100644
--- a/dag/gunbc/spark/pair_serving_apply.dag
+++ b/dag/gunbc/spark/pair_serving_apply.dag
@@ -3,7 +3,7 @@ module gunbc.spark.pair_serving_apply
 import std.types { String, Bool, List, NonEmptyStr, Secret, FilePath, EpochSecs }
 import gunbc.fabric_event_log_host { now_epoch_seconds }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import product.host_identity { HostIdentity }
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/gunbc/spark/pair_serving_authority_log.dag b/dag/gunbc/spark/pair_serving_authority_log.dag
index 64d5761ef08..76c5f80c069 100644
--- a/dag/gunbc/spark/pair_serving_authority_log.dag
+++ b/dag/gunbc/spark/pair_serving_authority_log.dag
@@ -4,7 +4,7 @@ import std.types { String, Bool, Int, NonEmptyStr, List, EpochSecs }
 import std.nat { Nat }
 import std.measure { Second, second, second_count }
 import gunbc.spark.host_effect_quiescence { HostEffectResidueSpec, HostQuiescenceEvidence, residue_spec_members, residue_spec_decode, quiescence_evidence_members, quiescence_evidence_decode, quiescence_evidence_covers, ReleaseProvenance, ClaimantTerminal, RecoveryAuthorized, release_provenance_members, release_provenance_decode, release_provenance_covers, parse_claimant_standing }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash, serialize_content_hash, parse_content_hash, content_hash_equal }
 import std.temporal_effect {
   HeldLease, HeldLeaseObservedState, LeaseEpoch, held_lease, held_lease_with_observed,
diff --git a/dag/gunbc/spark/pair_serving_capacity_floor.dag b/dag/gunbc/spark/pair_serving_capacity_floor.dag
index 567790b7239..a954e7e3449 100644
--- a/dag/gunbc/spark/pair_serving_capacity_floor.dag
+++ b/dag/gunbc/spark/pair_serving_capacity_floor.dag
@@ -1,7 +1,7 @@
 module gunbc.spark.pair_serving_capacity_floor
 
 import std.types { Bool, String, Int, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat }
 import std.measure { TokenCount, token_count, AllocatorBlockCount, allocator_block_count, allocator_block_count_value }
 import gunbc.spark.vllm_serving_launch { VllmServingLaunch, launch_wire }
diff --git a/dag/gunbc/spark/pair_serving_d0.dag b/dag/gunbc/spark/pair_serving_d0.dag
index f60dac007a1..8432da22030 100644
--- a/dag/gunbc/spark/pair_serving_d0.dag
+++ b/dag/gunbc/spark/pair_serving_d0.dag
@@ -4,7 +4,7 @@ import gunbc.auth.standing_operator_grant { StandingOperatorGrant, group_a_dev_s
 import std.types { String, Bool, Int, NonEmptyStr, List, EpochSecs, Port, Timestamp }
 import std.nat { Nat }
 import std.measure { Second, second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.resources { Network }
 import std.list { list_cover }
diff --git a/dag/gunbc/spark/pair_serving_d0_authorization.dag b/dag/gunbc/spark/pair_serving_d0_authorization.dag
index 1ca7a3ee334..653d861d42d 100644
--- a/dag/gunbc/spark/pair_serving_d0_authorization.dag
+++ b/dag/gunbc/spark/pair_serving_d0_authorization.dag
@@ -2,7 +2,7 @@ module gunbc.spark.pair_serving_d0_authorization
 
 import std.types { String, Bool, Int, NonEmptyStr, List, Timestamp }
 import std.measure { Second, second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash }
 import std.scoped_authorization { AuthorizationRequest, ScopedAuthorization, ClaimedBy }
 import gunbc.auth.approval_gate { ApprovalGateRefusal, ApprovalRecorded, ApprovalNotRecorded, approval_recorded_from_poll }
diff --git a/dag/gunbc/spark/pair_serving_d0_door.dag b/dag/gunbc/spark/pair_serving_d0_door.dag
index 4f47370aa65..3dc39eb2e69 100644
--- a/dag/gunbc/spark/pair_serving_d0_door.dag
+++ b/dag/gunbc/spark/pair_serving_d0_door.dag
@@ -9,7 +9,7 @@ import std.types { String, Bool, Int, NonEmptyStr, List, Timestamp, EpochSecs, G
 import std.algebra { trim }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import std.measure { Second, second, second_count, Minute, minute }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.scoped_authorization { AuthorizationRequest, ScopedAuthorization }
 import gunbc.auth.approval_gate {
diff --git a/dag/gunbc/spark/pair_serving_desired.dag b/dag/gunbc/spark/pair_serving_desired.dag
index b1ab0bbaf82..5d40cd51c00 100644
--- a/dag/gunbc/spark/pair_serving_desired.dag
+++ b/dag/gunbc/spark/pair_serving_desired.dag
@@ -6,7 +6,7 @@ import std.measure { token_count, basis_point, Millisecond, millisecond }
 import product.host_identity { HostIdentity, host_identity_eq }
 import extdeps.memory.types { UnifiedShared }
 import extdeps.network.ipv4 { Ipv4Address, render_ipv4_address }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.engine_args {
   VllmEngineArgs, VllmMemoryRequest, PrefixCachingExplicit, KvFp8DsMla, ExecutorRay,
   VllmPrefillSchedulingPolicy, ChunkedPrefillRequested, ChunkedPrefillNotRequested,
diff --git a/dag/gunbc/spark/pair_serving_launch_receipt.dag b/dag/gunbc/spark/pair_serving_launch_receipt.dag
index d23d0ee1b1b..ee353d64310 100644
--- a/dag/gunbc/spark/pair_serving_launch_receipt.dag
+++ b/dag/gunbc/spark/pair_serving_launch_receipt.dag
@@ -1,7 +1,7 @@
 module gunbc.spark.pair_serving_launch_receipt
 
 import std.types { Bool, String, Int, NonEmptyStr, List, EpochSecs }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat }
 import std.content_hash { ContentHash, compare_content_hash, ContentHashEqual, ContentHashDifferent, ContentHashCrossFamilyIncomparable }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
diff --git a/dag/gunbc/spark/pair_serving_realization.dag b/dag/gunbc/spark/pair_serving_realization.dag
index 2a8ec836635..cab75d2db0d 100644
--- a/dag/gunbc/spark/pair_serving_realization.dag
+++ b/dag/gunbc/spark/pair_serving_realization.dag
@@ -2,7 +2,7 @@ module gunbc.spark.pair_serving_realization
 
 import std.types { String, Bool, List, NonEmptyStr, FilePath, Port }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash }
 import extdeps.crypto.hash { sha256sum_line_digest, sha256_digest_content_hash }
 import extdeps.tools.sha256sum
diff --git a/dag/gunbc/spark/prefill_batch_sweep.dag b/dag/gunbc/spark/prefill_batch_sweep.dag
index d14e010f6dc..23e9ae77985 100644
--- a/dag/gunbc/spark/prefill_batch_sweep.dag
+++ b/dag/gunbc/spark/prefill_batch_sweep.dag
@@ -2,7 +2,7 @@ module gunbc.spark.prefill_batch_sweep
 
 import std.types { Bool, String, NonEmptyStr, List }
 import std.nat { Nat, nat_min, nat_ceil_div }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { TokenCount, token_count, token_count_value }
 import extdeps.vllm.batch_defaults { UpstreamBatchDefaultResolution, spark_gb10_batch_default_resolution }
 import extdeps.vllm.engine_args { VllmKvCacheDtypeRequest, VllmSpeculativePolicy, SpeculativeDecodingOff }
diff --git a/dag/gunbc/spark/released_baseline.dag b/dag/gunbc/spark/released_baseline.dag
index ea1333cd56f..300140841de 100644
--- a/dag/gunbc/spark/released_baseline.dag
+++ b/dag/gunbc/spark/released_baseline.dag
@@ -1,7 +1,7 @@
 module gunbc.spark.released_baseline
 
 import std.types { String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // ── THE STATE A TRANSACTION RETURNS THE HOSTS TO IS DECLARED BEFORE IT STARTS ──────────────────
 //
diff --git a/dag/gunbc/spark/rendezvous_participation.dag b/dag/gunbc/spark/rendezvous_participation.dag
index b3016ff7757..51f037b0dee 100644
--- a/dag/gunbc/spark/rendezvous_participation.dag
+++ b/dag/gunbc/spark/rendezvous_participation.dag
@@ -3,7 +3,7 @@ module gunbc.spark.rendezvous_participation
 import std.types { String, Bool, List, NonEmptyStr, Int }
 import std.nat { Nat }
 import v2.std.algebra { length, filter }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import extdeps.iproute2.ss { ss_established_to_peer_argv, ss_enumeration_line_count }
 import extdeps.systemd {
diff --git a/dag/gunbc/spark/runtime_architecture_registry_reading.dag b/dag/gunbc/spark/runtime_architecture_registry_reading.dag
index a5a25f4d376..85dae6c09a1 100644
--- a/dag/gunbc/spark/runtime_architecture_registry_reading.dag
+++ b/dag/gunbc/spark/runtime_architecture_registry_reading.dag
@@ -2,7 +2,7 @@ module gunbc.spark.runtime_architecture_registry_reading
 
 import std.types { String, Bool, Int, List, NonEmptyStr }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.deepseek.deepseek_v4_1_flash { deepseek_v4_1_flash_architecture_class }
 
 // WHICH ARCHITECTURES AN IMAGE ANSWERS FOR IS SOMETHING WE READ, NOT SOMETHING ITS PUBLISHER SAYS.
diff --git a/dag/gunbc/spark/runtime_image_produce_dispatch.dag b/dag/gunbc/spark/runtime_image_produce_dispatch.dag
index 4e0fd99dd95..63ca8321891 100644
--- a/dag/gunbc/spark/runtime_image_produce_dispatch.dag
+++ b/dag/gunbc/spark/runtime_image_produce_dispatch.dag
@@ -3,7 +3,7 @@ module gunbc.spark.runtime_image_produce_dispatch
 import std.types { String, List, NonEmptyStr }
 import std.process { ProcessExit, exit_failure }
 import gunbc.fleet_multi_principal_probe { env_var_nonempty }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.group_image_produce { GroupImageProduction, group_image_produce_wet, ProducedImageHeld, produced_image_distribute_wet }
 import gunbc.spark.v41_runtime_image_converge { v41_runtime_image_production, v41_produced_image_held }
 import gunbc.spark.glm53_kvplan_image { glm53_kvplan_production, glm53_kvplan_produced_image_held }
diff --git a/dag/gunbc/spark/serving_deployment_selection.dag b/dag/gunbc/spark/serving_deployment_selection.dag
index 561f1078782..c9676d3814e 100644
--- a/dag/gunbc/spark/serving_deployment_selection.dag
+++ b/dag/gunbc/spark/serving_deployment_selection.dag
@@ -4,7 +4,7 @@ import std.types { Bool, Int, String, NonEmptyStr, List }
 import std.nat { Nat, nat_range_inclusive }
 import std.checked_arithmetic { checked_int_to_nat }
 import std.measure { TokenCount, token_count, token_count_value, basis_point, basis_point_count, ByteSize, byte_size, byte_size_count, measure_add, measure_scale_fraction_floor, measure_scale_fraction_ceil, measure_le, measure_sub, MeasureDifference, MeasureSubtrahendExceedsMinuend }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.engine_args {
   VllmMemoryRequest, vllm_memory_request_key,
   VllmKvCacheDtypeRequest, KvFp8DsMla, vllm_kv_cache_dtype_wire, vllm_kv_cache_dtype_request_matching_wire,
diff --git a/dag/gunbc/spark/serving_group_launch.dag b/dag/gunbc/spark/serving_group_launch.dag
index 1a3e2b50f90..b8667c4b40c 100644
--- a/dag/gunbc/spark/serving_group_launch.dag
+++ b/dag/gunbc/spark/serving_group_launch.dag
@@ -1,7 +1,7 @@
 module gunbc.spark.serving_group_launch
 
 import std.types { String, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import gunbc.spark.fabric_switch_observed { FabricGroup, FabricGroupA, FabricGroupB }
 import gunbc.spark.pair_serving_realization {
diff --git a/dag/gunbc/spark/serving_load_probe.dag b/dag/gunbc/spark/serving_load_probe.dag
index 375f4fd9fb1..2694e5aafc6 100644
--- a/dag/gunbc/spark/serving_load_probe.dag
+++ b/dag/gunbc/spark/serving_load_probe.dag
@@ -7,7 +7,7 @@ import std.measure {
 }
 import std.decimal { ExactDecimal, canonical_exact_decimal, checked_decimal_rescale, checked_decimal_pow10, exact_decimal_sub, ExactDifference, ExactDifferenceUnrepresentable, ExactDifferenceOperandScaleRefused }
 import std.checked_arithmetic { checked_int_to_nat, CheckedIntReady, CheckedIntOverflow }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash, content_hash_of_value, serialize_content_hash }
 import product.capacity.lease { LeaseGrant }
 import extdeps.prometheus.client {
diff --git a/dag/gunbc/spark/serving_load_runner.dag b/dag/gunbc/spark/serving_load_runner.dag
index db24b559b72..ca730dd161c 100644
--- a/dag/gunbc/spark/serving_load_runner.dag
+++ b/dag/gunbc/spark/serving_load_runner.dag
@@ -3,7 +3,7 @@ module gunbc.spark.serving_load_runner
 import std.types { Int, List, NonEmptyStr, String }
 import std.nat { Nat }
 import std.measure { second }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.collection { list_at_optional }
 import product.host_identity { HostIdentity }
 import extdeps.tools.curl { curl_bounded_get_argv }
diff --git a/dag/gunbc/spark/serving_performance_subject.dag b/dag/gunbc/spark/serving_performance_subject.dag
index 6add8c32b03..3ac1239e245 100644
--- a/dag/gunbc/spark/serving_performance_subject.dag
+++ b/dag/gunbc/spark/serving_performance_subject.dag
@@ -1,7 +1,7 @@
 module gunbc.spark.serving_performance_subject
 
 import std.types { Bool, String, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat }
 import std.measure { TokenCount, token_count, token_count_value }
 import std.content_hash { ContentHash, content_hash_of_value, serialize_content_hash }
diff --git a/dag/gunbc/spark/serving_promotion.dag b/dag/gunbc/spark/serving_promotion.dag
index 511fbbbe69f..960acbbc027 100644
--- a/dag/gunbc/spark/serving_promotion.dag
+++ b/dag/gunbc/spark/serving_promotion.dag
@@ -2,7 +2,7 @@ module gunbc.spark.serving_promotion
 
 import std.types { Bool, List, NonEmptyStr, String }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { BasisPoint, basis_point, basis_point_count, Second, second_count }
 import v2.std.algebra { length }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
diff --git a/dag/gunbc/spark/snapshot_rail_replica.dag b/dag/gunbc/spark/snapshot_rail_replica.dag
index ef2055f6165..2776d7e5d3c 100644
--- a/dag/gunbc/spark/snapshot_rail_replica.dag
+++ b/dag/gunbc/spark/snapshot_rail_replica.dag
@@ -2,7 +2,7 @@ module gunbc.spark.snapshot_rail_replica
 
 import std.types { String, Bool, List, NonEmptyStr }
 import std.types { Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { sha256_hex_digest }
 import product.host_identity { HostIdentity }
 import extdeps.huggingface.hub { HubRepoId, hub_repo_cache_directory }
diff --git a/dag/gunbc/spark/spark_file_blob.dag b/dag/gunbc/spark/spark_file_blob.dag
index fc103887326..1a76a981aa6 100644
--- a/dag/gunbc/spark/spark_file_blob.dag
+++ b/dag/gunbc/spark/spark_file_blob.dag
@@ -3,7 +3,7 @@ module gunbc.spark.spark_file_blob
 import std.types { String, Bool, Int, List, NonEmptyStr }
 import std.nat { Nat }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.crypto.hash { sha256sum_argv, sha256sum_line_digest }
 import extdeps.tools.curl { curl_exit_status_is_unreachable }
 import extdeps.tools.rsync { rsync_exit_status_is_unreachable }
diff --git a/dag/gunbc/spark/standing_host_effect_recover.dag b/dag/gunbc/spark/standing_host_effect_recover.dag
index ba23a3cbd7c..3555bee031c 100644
--- a/dag/gunbc/spark/standing_host_effect_recover.dag
+++ b/dag/gunbc/spark/standing_host_effect_recover.dag
@@ -2,7 +2,7 @@ module gunbc.spark.standing_host_effect_recover
 
 import std.types { String, Bool, List, NonEmptyStr, EpochSecs }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity, host_identity_eq }
 import product.capacity.event_chain { EventId }
 import gunbc.auth.standing_operator_grant { StandingOperatorGrant, standing_grant_covers, StandingHostEffectRecover }
diff --git a/dag/gunbc/spark/tensor_parallel_comparison.dag b/dag/gunbc/spark/tensor_parallel_comparison.dag
index 83a96f89554..760c4315d30 100644
--- a/dag/gunbc/spark/tensor_parallel_comparison.dag
+++ b/dag/gunbc/spark/tensor_parallel_comparison.dag
@@ -2,7 +2,7 @@ module gunbc.spark.tensor_parallel_comparison
 
 import std.types { Bool, String, NonEmptyStr, List }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { TokenCount, token_count, token_count_value }
 import extdeps.vllm.engine_args { VllmKvCacheDtypeRequest, VllmSpeculativePolicy }
 import extdeps.nvidia.nccl { NcclRealizedTransport }
diff --git a/dag/gunbc/spark/v41_capacity_measurement.dag b/dag/gunbc/spark/v41_capacity_measurement.dag
index 2cf093f9271..5ce693d9fb8 100644
--- a/dag/gunbc/spark/v41_capacity_measurement.dag
+++ b/dag/gunbc/spark/v41_capacity_measurement.dag
@@ -14,7 +14,7 @@ import std.measure {
 }
 import std.content_hash { Sha256Digest, Sha256DigestHex, ContentHash }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.staircase { StepVerdict, StepStops, StepContinues, StaircaseOutcome, StaircaseStopped, StaircaseCompleted, StaircaseRefused, StaircasePlanEmpty, StaircasePlanLevelDuplicated, run_staircase }
 import extdeps.external_authority { CitedFigureStanding, TranscribedUncited }
 import extdeps.vllm.server { VllmSourceRevision }
diff --git a/dag/gunbc/spark/v41_checkpoint_materialize.dag b/dag/gunbc/spark/v41_checkpoint_materialize.dag
index 88234cac09d..2d8cbd7a401 100644
--- a/dag/gunbc/spark/v41_checkpoint_materialize.dag
+++ b/dag/gunbc/spark/v41_checkpoint_materialize.dag
@@ -6,7 +6,7 @@ import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.algebra { trim }
 import std.measure { ByteSize, byte_size, byte_size_count }
 import std.content_hash { Sha256Digest, sha256_hex_digest }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io {
   Filesystem, FilesystemListingObservation, filesystem_listing_observation, filesystem_read_outcome, filesystem_file_observation,
   FilesystemFileObservation, FilesystemFileAbsent, FilesystemFileRead, FilesystemFileIndeterminate, FilesystemFileObservationsDisagree, FilesystemFileSubjectRefused,
diff --git a/dag/gunbc/spark/v41_engram_differential_run.dag b/dag/gunbc/spark/v41_engram_differential_run.dag
index 808afb4f578..f7e241394b4 100644
--- a/dag/gunbc/spark/v41_engram_differential_run.dag
+++ b/dag/gunbc/spark/v41_engram_differential_run.dag
@@ -6,7 +6,7 @@ import std.checked_arithmetic { nat_magnitude }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.algebra { trim }
 import std.measure { ByteSize, byte_size, byte_size_count, Second, second, second_count, kibibyte, kibibyte_to_byte_size }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import v2.std.collection { list_at_optional }
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/gunbc/spark/v41_engram_file_backed.dag b/dag/gunbc/spark/v41_engram_file_backed.dag
index 16c19a4f994..2f3ea5a744d 100644
--- a/dag/gunbc/spark/v41_engram_file_backed.dag
+++ b/dag/gunbc/spark/v41_engram_file_backed.dag
@@ -4,7 +4,7 @@ import std.types { String, Bool, List, NonEmptyStr }
 import std.nat { Nat }
 import std.integer { UInt8 }
 import std.measure { ByteSize, byte_size_count, Microsecond, microsecond, microsecond_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter, length, skip }
 import std.list { distinct_by_key }
 import gunbc.spark.v41_engram_row_store {
diff --git a/dag/gunbc/spark/v41_engram_row_store.dag b/dag/gunbc/spark/v41_engram_row_store.dag
index b446b6a1d7b..a3280782eaa 100644
--- a/dag/gunbc/spark/v41_engram_row_store.dag
+++ b/dag/gunbc/spark/v41_engram_row_store.dag
@@ -9,7 +9,7 @@ import std.decl_ref { DeclarationRef, declaration_ref_display_key }
 import std.content_hash { ContentHash, Sha256Hash, Sha256Digest, Sha256DigestHex, sha256_hex_digest, serialize_content_hash }
 import std.artifact_store { ArtifactRealizationInput, artifact_realization_digest }
 import std.measure { ByteSize, byte_size, byte_size_count, measure_add }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.safetensors.format {
   SafetensorsEntry, SafetensorsDtype,
   safetensors_dtype_byte_width, safetensors_dtype_token,
diff --git a/dag/gunbc/spark/v41_engram_staging.dag b/dag/gunbc/spark/v41_engram_staging.dag
index 53f417d92f0..5bfa538520d 100644
--- a/dag/gunbc/spark/v41_engram_staging.dag
+++ b/dag/gunbc/spark/v41_engram_staging.dag
@@ -5,7 +5,7 @@ import std.nat { Nat }
 import std.content_hash { ContentHash, Sha256Hash, serialize_content_hash }
 import std.artifact_store { artifact_realization_digest }
 import std.decl_ref { DeclarationRef }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.v41_identity_input { v41_input }
 import gunbc.spark.v41_engram_row_store {
   V41RowStoreEncoding, V41RowStoreEncodingIdentified, V41RowStoreEncodingUnestablished, V41RowStoreEncodingRefused,
diff --git a/dag/gunbc/spark/v41_engram_store_manifest.dag b/dag/gunbc/spark/v41_engram_store_manifest.dag
index 75ea6d9ab92..cc0a0f4c2dc 100644
--- a/dag/gunbc/spark/v41_engram_store_manifest.dag
+++ b/dag/gunbc/spark/v41_engram_store_manifest.dag
@@ -3,7 +3,7 @@ module gunbc.spark.v41_engram_store_manifest
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.nat { Nat }
 import std.measure { byte_size_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import extdeps.languages.json.emit { JsonValue, json_object, json_kv, json_string, json_int, json_array, serialize_json }
 import gunbc.spark.v41_engram_row_store {
diff --git a/dag/gunbc/spark/v41_group_a_launch.dag b/dag/gunbc/spark/v41_group_a_launch.dag
index a45812d8aa3..adc1b2bc694 100644
--- a/dag/gunbc/spark/v41_group_a_launch.dag
+++ b/dag/gunbc/spark/v41_group_a_launch.dag
@@ -3,7 +3,7 @@ module gunbc.spark.v41_group_a_launch
 import gunbc.spark.pair_serving_d0_door { StandingGrantRowNotOnMain }
 import std.types { String, Bool, Int, List, NonEmptyStr, Port, FilePath }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.measure { byte_size, Kibibyte }
 import std.content_hash { ContentHash, content_hash_equal, serialize_content_hash }
diff --git a/dag/gunbc/spark/v41_row_store_encode.dag b/dag/gunbc/spark/v41_row_store_encode.dag
index 1b27f8db24d..d851a1b165d 100644
--- a/dag/gunbc/spark/v41_row_store_encode.dag
+++ b/dag/gunbc/spark/v41_row_store_encode.dag
@@ -7,7 +7,7 @@ import std.decl_ref { DeclarationRef, decl_ref }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
 import std.measure { ByteSize, byte_size_count }
 import gunbc.spark.v41_checkpoint_materialize { v41_checkpoint_repo_directory }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.numeric.base16 { byte_hex_lower }
 import extdeps.deepseek.deepseek_v4_1_flash {
   deepseek_v4_1_flash_engram, deepseek_v4_1_flash_engram_sharded_entries, deepseek_v4_1_flash_engram_shard_files,
diff --git a/dag/gunbc/spark/v41_row_store_encode_run.dag b/dag/gunbc/spark/v41_row_store_encode_run.dag
index 8f16a25109f..607f56a894f 100644
--- a/dag/gunbc/spark/v41_row_store_encode_run.dag
+++ b/dag/gunbc/spark/v41_row_store_encode_run.dag
@@ -7,7 +7,7 @@ import std.resources { Network }
 import std.algebra { trim }
 import std.content_hash { Sha256Digest, sha256_hex_digest }
 import std.measure { ByteSize, byte_size, byte_size_count, Kibibyte, kibibyte }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.crypto.hash { sha256sum_argv, sha256sum_line_digest }
 import extdeps.deepseek.deepseek_v4_1_flash {
diff --git a/dag/gunbc/spark/v41_row_store_readback_run.dag b/dag/gunbc/spark/v41_row_store_readback_run.dag
index becc2ef540f..6b17ebc9433 100644
--- a/dag/gunbc/spark/v41_row_store_readback_run.dag
+++ b/dag/gunbc/spark/v41_row_store_readback_run.dag
@@ -6,7 +6,7 @@ import std.process { ProcessExit, ExitSuccess, exit_failure }
 import std.resources { Network }
 import std.algebra { trim }
 import std.measure { ByteSize, byte_size_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.exec.command { argv_words }
 import extdeps.tools.gnu_coreutils { od_hex_span_command }
diff --git a/dag/gunbc/spark/v41_runtime_candidate.dag b/dag/gunbc/spark/v41_runtime_candidate.dag
index e1e19882187..d686520a8bd 100644
--- a/dag/gunbc/spark/v41_runtime_candidate.dag
+++ b/dag/gunbc/spark/v41_runtime_candidate.dag
@@ -6,7 +6,7 @@ import std.decl_ref { DeclarationRef, DeclField, WholeDeclaration, NamedField, d
 import std.content_hash { ContentHash, Sha256Digest, content_hash_atom, serialize_content_hash, sha256_hex_digest }
 import std.artifact_store { ArtifactRealizationInput, artifact_realization_digest }
 import std.measure { hardware_thread_count_value, byte_size_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.gpu.types {
   GpuComputeCapability, GpuCapabilityLabelOk, GpuCapabilityLabelRejected, gpu_compute_capability_sm_label,
 }
diff --git a/dag/gunbc/spark/v41_runtime_image_converge.dag b/dag/gunbc/spark/v41_runtime_image_converge.dag
index 530ffc4854e..0975fb2fd13 100644
--- a/dag/gunbc/spark/v41_runtime_image_converge.dag
+++ b/dag/gunbc/spark/v41_runtime_image_converge.dag
@@ -3,7 +3,7 @@ module gunbc.spark.v41_runtime_image_converge
 import extdeps.crypto.hash { digest_shell_verify_line, sha256_digest }
 import std.types { String, Bool, List, NonEmptyStr, FilePath }
 
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 import extdeps.container.oci.digest { OciContentDigest, OciSha256Digest, parse_oci_content_digest_wire, render_oci_content_digest_wire }
 import std.content_hash { Sha256Digest, Sha256DigestHex }
diff --git a/dag/gunbc/spark/v41_runtime_realized.dag b/dag/gunbc/spark/v41_runtime_realized.dag
index 74fbd9b68e8..c6cf91957c6 100644
--- a/dag/gunbc/spark/v41_runtime_realized.dag
+++ b/dag/gunbc/spark/v41_runtime_realized.dag
@@ -9,7 +9,7 @@ import std.artifact_store {
 }
 import std.measure { ByteSize, byte_size, byte_size_count }
 import std.realization { Placement, LocalFilesystem, RemoteNetwork, LocalInProcess, LocalAccelerator }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.v41_runtime_candidate { v41_derivation_obligations,
   V41CandidateVerdict, V41CandidateKeyed, V41CandidateUnestablished, V41CandidateRefused,
   V41RuntimeArtifactInputs,
diff --git a/dag/gunbc/spark/v41_serving_load.dag b/dag/gunbc/spark/v41_serving_load.dag
index 3a8ec52e084..218943fac00 100644
--- a/dag/gunbc/spark/v41_serving_load.dag
+++ b/dag/gunbc/spark/v41_serving_load.dag
@@ -4,7 +4,7 @@ import std.types { Bool, List, NonEmptyStr, String }
 import std.nat { Nat }
 import std.algebra { trim }
 import std.measure { token_count, microsecond_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
 import product.host_identity { HostIdentity }
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/gunbc/spark/v41_source_patch_converge.dag b/dag/gunbc/spark/v41_source_patch_converge.dag
index d1e2f1a188c..6d5d491b0f7 100644
--- a/dag/gunbc/spark/v41_source_patch_converge.dag
+++ b/dag/gunbc/spark/v41_source_patch_converge.dag
@@ -4,7 +4,7 @@ import std.algebra { trim }
 import std.types { String, Bool, List, NonEmptyStr, FilePath, GitRef }
 import std.content_hash { ContentHash, Sha256Digest, sha256_hex_digest }
 import std.artifact_store { ArtifactRealizationInput }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.upsert_decision { UpsertDecision, Noop, Apply, Refuse }
 import std.realization_reconcile {
   ReconciledEffect, Application, Applied, NotApplied,
diff --git a/dag/gunbc/spark/v41_source_patch_converge_wet.dag b/dag/gunbc/spark/v41_source_patch_converge_wet.dag
index f8d1e4cadc3..a885db3b67d 100644
--- a/dag/gunbc/spark/v41_source_patch_converge_wet.dag
+++ b/dag/gunbc/spark/v41_source_patch_converge_wet.dag
@@ -2,7 +2,7 @@ module gunbc.spark.v41_source_patch_converge_wet
 
 import std.types { String, NonEmptyStr }
 import std.process { ProcessExit, ExitSuccess, exit_failure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.vllm.source_build { vllm_clone_url }
 import gunbc.clock_read { clock_now_probed_at, probed_at_word }
diff --git a/dag/gunbc/spark/vllm_allocation_plan_observe.dag b/dag/gunbc/spark/vllm_allocation_plan_observe.dag
index 2f5241cc7af..b70f5d95425 100644
--- a/dag/gunbc/spark/vllm_allocation_plan_observe.dag
+++ b/dag/gunbc/spark/vllm_allocation_plan_observe.dag
@@ -8,7 +8,7 @@ import std.measure {
 }
 import std.content_hash { ContentHash, content_hash_validate_lower_hex_syntax }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat }
 import extdeps.languages.json.parse {
   parse_json_document, JsonDocumentParsed, JsonDocumentUnreadable,
diff --git a/dag/gunbc/spark/vllm_serving_launch.dag b/dag/gunbc/spark/vllm_serving_launch.dag
index 56a15e1c86b..ff94d2ae037 100644
--- a/dag/gunbc/spark/vllm_serving_launch.dag
+++ b/dag/gunbc/spark/vllm_serving_launch.dag
@@ -2,7 +2,7 @@ module gunbc.spark.vllm_serving_launch
 
 import std.types { Bool, String, NonEmptyStr, List, EpochSecs }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash, compare_content_hash, ContentHashComparison, ContentHashEqual, ContentHashDifferent, ContentHashCrossFamilyIncomparable }
 import product.host_identity { HostIdentity }
 import gunbc.spark.fabric_switch_observed { FabricGroup, fabric_group_wire }
diff --git a/dag/gunbc/stage0/stage0_crate_partition_generated.dag b/dag/gunbc/stage0/stage0_crate_partition_generated.dag
index 457b32bbb87..f35f14fba70 100644
--- a/dag/gunbc/stage0/stage0_crate_partition_generated.dag
+++ b/dag/gunbc/stage0/stage0_crate_partition_generated.dag
@@ -50,6 +50,7 @@ data generated_partition_crate_rows: List<GeneratedPartitionCrateRow> = [
         "std_measure",
         "std_types",
         "std_unicode_types",
+        "std_optional",
         "std_algebra",
         "std_nat",
         "std_node",
diff --git a/dag/gunbc/structural_realization_bindings.dag b/dag/gunbc/structural_realization_bindings.dag
index f79b5ef780d..8af28a134fc 100644
--- a/dag/gunbc/structural_realization_bindings.dag
+++ b/dag/gunbc/structural_realization_bindings.dag
@@ -122,5 +122,5 @@ data kernel_grounding_rows: List<KernelGrounding> = [
 data kernel_optional_mint_name: String = "Optional"
 
 data kernel_mint_declaration_rows: List<KernelMintDeclaration> = [
-  KernelMintDeclaration { minted_name: kernel_optional_mint_name as NonEmptyStr, declaration: decl_ref(module_path: "v2.std.optional", decl_name: "Optional") }
+  KernelMintDeclaration { minted_name: kernel_optional_mint_name as NonEmptyStr, declaration: decl_ref(module_path: "std.optional", decl_name: "Optional") }
 ]
diff --git a/dag/gunbc/target_binding.dag b/dag/gunbc/target_binding.dag
index 76098ef9a71..c4132b26ef3 100644
--- a/dag/gunbc/target_binding.dag
+++ b/dag/gunbc/target_binding.dag
@@ -4,7 +4,7 @@ import extdeps.bazel.label {
   Label, LabelCanonicalityCause, LabelCanonical, LabelNonCanonical,
   render_label, label_canonicality,
 }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import std.types { String, List, NonEmptyStr }
 import std.integer { Int }
 
diff --git a/dag/gunbc/toolchain_coherence.dag b/dag/gunbc/toolchain_coherence.dag
index c44c1396652..2cf1ad730d4 100644
--- a/dag/gunbc/toolchain_coherence.dag
+++ b/dag/gunbc/toolchain_coherence.dag
@@ -11,7 +11,7 @@ import std.content_hash {
 }
 import extdeps.realization.emit_on_demand_host { ObservedToolIdentity }
 import gunbc.build_cache_instance { RunnerSlotIdentity }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.disposition { Disposition, Terminal }
 
 // THE RELATION IS TERMINAL; ITS PRODUCTION STANDING IS A STALL. Two facts, kept apart, because
diff --git a/dag/gunbc/toolchain_workflow_steps.dag b/dag/gunbc/toolchain_workflow_steps.dag
index a96c07f9777..1348e0bd306 100644
--- a/dag/gunbc/toolchain_workflow_steps.dag
+++ b/dag/gunbc/toolchain_workflow_steps.dag
@@ -28,7 +28,7 @@ import v2.workflow.ci_workflow_run_emit {
   ci_toolchain_home_isolation_script,
   ci_pin_rustup_default_script,
 }
-import v2.std.optional { Present }
+import std.optional { Present }
 
 // THE STEP NAME IS NOT "Isolate toolchain dirs". That name is load-bearing elsewhere --
 // gunbc.ci_materialization ci_cost_floor_exempt_step_names_note keys the cost-floor exempt roster
diff --git a/dag/gunbc/v1/v1_interpreter_dispatch_emit.dag b/dag/gunbc/v1/v1_interpreter_dispatch_emit.dag
index 79af0214217..6e6f2c37185 100644
--- a/dag/gunbc/v1/v1_interpreter_dispatch_emit.dag
+++ b/dag/gunbc/v1/v1_interpreter_dispatch_emit.dag
@@ -13,7 +13,7 @@ import gunbc.v1_interpreter_primitive_surface {
   v1_interpreter_authored_roster_arms,
 }
 import v2.std.algebra { fold_list }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name { QualifiedName, qualified_name_to_dotted_string }
 import v2.std.text { String }
 
diff --git a/dag/gunbc/witness/compiler_gate_workflow.dag b/dag/gunbc/witness/compiler_gate_workflow.dag
index 0198b521fc1..3d0913bf306 100644
--- a/dag/gunbc/witness/compiler_gate_workflow.dag
+++ b/dag/gunbc/witness/compiler_gate_workflow.dag
@@ -72,7 +72,7 @@ module gunbc.compiler_gate_workflow
 
 import std.measure { Minute, minute, minute_count }
 import std.types { Bool, Int, List, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { list_map, filter, length }
 import std.algebra { list_append }
 import extdeps.languages.yaml.types { YamlKeyValue, yaml_string, yaml_int, yaml_bool, kv }
diff --git a/dag/gunbc/witness/v2_native_route.dag b/dag/gunbc/witness/v2_native_route.dag
index ae5c2e9c9bd..ebb29fcf4c6 100644
--- a/dag/gunbc/witness/v2_native_route.dag
+++ b/dag/gunbc/witness/v2_native_route.dag
@@ -4,7 +4,7 @@ import v2.std.algebra { any, count_where, filter, fold_list, is_empty, length, l
 import std.algebra { list_append, list_snoc_item }
 import v2.std.integer { Int }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import std.types { NonEmptyStr, List }
 import extdeps.bazel.label { LabelParse, PackagePath, parse_label }
 import extdeps.bazel.target_pattern { SubtreeTargets, TargetPattern }
diff --git a/dag/gunbc/witness/witness_execution_class.dag b/dag/gunbc/witness/witness_execution_class.dag
index 268cde69646..360841d40ee 100644
--- a/dag/gunbc/witness/witness_execution_class.dag
+++ b/dag/gunbc/witness/witness_execution_class.dag
@@ -2,7 +2,7 @@ module gunbc.witness_execution_class
 
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree, SubstrateInputsOnly }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 
 data witness_execution_class_note: NonEmptyStr = "CI-0 commit 3 (operator recut 2026-08-08): the complete enrolled witness roster is classified EXACTLY ONCE, BEFORE execution — an execution plan, never try-native-then-silently-reinterpret (the fallback shape this PR deletes). Classification is derived from standing facts the corpus already declares, never from a failed native attempt: the file-grain live_tree_disposition row (the same row floor discovery reads, undeclared = ReadsLiveTree per the producer's fail-closed default), the effect requirement, the interpreter-subject axis, and membership in the population the current emitter faithfully carries. There is NO runtime reclassification arm: a NativeRequired witness whose native execution fails REFUSES — no function here can return a different class for the same facts after a failure, because failure is not an input. Honest standing (review 50546/50550 class): the executing consumers today are the witness controls and the commit-3 census receipt (docs/plans/ci0-witness-execution-census.md) — no floor-plan caller classifies the roster in production yet, because the census itself falsified the whole-corpus emission this classifier was to schedule (3 of 8,828 identities emitter-carriable; Outcome C). Dissolve-on / enroll-on: the general witness→TargetModel producer lands (body-lowering keystone), at which point the floor plan derives its execution schedule through classify_witness and this note's standing sentence deletes."
 
diff --git a/dag/gunbc/witness/witness_row_cost.dag b/dag/gunbc/witness/witness_row_cost.dag
index bd773533790..70ce32f8c5b 100644
--- a/dag/gunbc/witness/witness_row_cost.dag
+++ b/dag/gunbc/witness/witness_row_cost.dag
@@ -60,7 +60,7 @@ import std.observation {
   clock_basis_eq,
   observation_duration_of,
 }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.text { String }
 
 // Per-witness cost receipts (placement workstream #5 spine). THE RECORD is
diff --git a/dag/gunbc/workspace_allocation_admission.dag b/dag/gunbc/workspace_allocation_admission.dag
index dbabf6743eb..4494592c293 100644
--- a/dag/gunbc/workspace_allocation_admission.dag
+++ b/dag/gunbc/workspace_allocation_admission.dag
@@ -1,7 +1,7 @@
 module gunbc.workspace_allocation_admission
 
 import std.types { NonEmptyStr, String, Timestamp, List }
-import v2.std.optional { Optional, Absent, Present }
+import std.optional { Optional, Absent, Present }
 import gunbc.workspace_allocation { WorkspaceRequest, WorkspaceAllocationId, workspace_profile_parse, workspace_policy_ref, workspace_lease_bound_seconds }
 import gunbc.auth.approval_capability { utc_instant_is_canonical, utc_instant_seconds_after }
 import std.access { AccessDecision, Permit, Deny, AccessActionNotGranted, decision_meet }
diff --git a/dag/std/algebra.dag b/dag/std/algebra.dag
index 40773f71a5c..bb4afc403d5 100644
--- a/dag/std/algebra.dag
+++ b/dag/std/algebra.dag
@@ -1,4 +1,5 @@
 module std.algebra
+import std.optional { Absent, Present }
 
 import std.error_primitives { DivError, Result }
 
diff --git a/dag/std/cache_interface.dag b/dag/std/cache_interface.dag
index 681b64af5f6..36e0fd4b875 100644
--- a/dag/std/cache_interface.dag
+++ b/dag/std/cache_interface.dag
@@ -1,7 +1,7 @@
 module std.cache_interface
 
 import std.types { NonEmptyStr, Bool, Int, LogicalTime, brand, List }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import std.decl_ref { DeclarationRef }
 import std.content_hash { ContentHash }
 import std.measure { Nano, ByteSize, Second, second, Nanosecond, nanosecond, nanosecond_count }
diff --git a/dag/std/checked_arithmetic.dag b/dag/std/checked_arithmetic.dag
index a0dfdaae271..6f8b21bc9ba 100644
--- a/dag/std/checked_arithmetic.dag
+++ b/dag/std/checked_arithmetic.dag
@@ -1,4 +1,5 @@
 module std.checked_arithmetic
+import std.optional { Present }
 
 import std.nat { Nat }
 
diff --git a/dag/std/checkpointed_workspace.dag b/dag/std/checkpointed_workspace.dag
index 92d70f4e66e..bfd3ea8b286 100644
--- a/dag/std/checkpointed_workspace.dag
+++ b/dag/std/checkpointed_workspace.dag
@@ -1,7 +1,7 @@
 module std.checkpointed_workspace
 
 import std.types { String, NonEmptyStr, Int, Bool, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { Cons, Empty }
 import std.measure { ByteSize, byte_size, measure_count, Nanosecond, nanosecond, nanosecond_count, ObservationInstant, InstantOrder, InstantBefore, InstantSame, InstantAfter, InstantIncomparable, compare_instants }
 import std.durable_compare_and_set { CasGeneration }
diff --git a/dag/std/computation.dag b/dag/std/computation.dag
index a1cf0559192..87525c8cb5e 100644
--- a/dag/std/computation.dag
+++ b/dag/std/computation.dag
@@ -1,4 +1,5 @@
 module std.computation
+import std.optional { Absent, Present }
 
 import std.termination {
   DescentEvidence, DescentUnknown, RankingDimension,
diff --git a/dag/std/content_hash.dag b/dag/std/content_hash.dag
index eeee516268e..95d87d8171b 100644
--- a/dag/std/content_hash.dag
+++ b/dag/std/content_hash.dag
@@ -1,4 +1,5 @@
 module std.content_hash
+import std.optional { Absent, Present }
 
 import std.types { NonEmptyStr, String, Bool }
 
diff --git a/dag/std/effects.dag b/dag/std/effects.dag
index 96a7333b4c7..95f7f8291b4 100644
--- a/dag/std/effects.dag
+++ b/dag/std/effects.dag
@@ -1,4 +1,5 @@
 module std.effects
+import std.optional { Absent, Present }
 
 import std.types { String, List }
 import std.realization_schedule { string_list_eq }
diff --git a/dag/std/evaluation_budget.dag b/dag/std/evaluation_budget.dag
index 9c583c31655..230ab9c6419 100644
--- a/dag/std/evaluation_budget.dag
+++ b/dag/std/evaluation_budget.dag
@@ -1,6 +1,7 @@
 module std.evaluation_budget
 
 import std.types { NonEmptyStr, Bool, Int, String }
+import std.optional { Absent, Optional, Present }
 import std.contract_identity { ContractIdentity, ContractName }
 import std.measure {
   Nanosecond,
diff --git a/dag/std/fabric_blob.dag b/dag/std/fabric_blob.dag
index 65b931f6479..8c554df4f59 100644
--- a/dag/std/fabric_blob.dag
+++ b/dag/std/fabric_blob.dag
@@ -1,7 +1,7 @@
 module std.fabric_blob
 
 import std.types { String, NonEmptyStr, Bool, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { Sha256Digest, content_hash_eq_cryptographic, sha256_hex_digest }
 import std.measure { ByteSize, byte_size, measure_count }
 import std.algebra { trim }
diff --git a/dag/std/fermi.dag b/dag/std/fermi.dag
index 2b864683197..576b2753da7 100644
--- a/dag/std/fermi.dag
+++ b/dag/std/fermi.dag
@@ -2,7 +2,7 @@ module std.fermi
 
 import std.types { FermiDepth, L, List, M, Milliseconds, S, Xl, Xs }
 import std.algebra { BoundedLattice }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 fn fermi_ordinal(depth: FermiDepth) -> Int {
   match depth {
diff --git a/dag/std/induction.dag b/dag/std/induction.dag
index 8265daa1422..05229e8e551 100644
--- a/dag/std/induction.dag
+++ b/dag/std/induction.dag
@@ -1,4 +1,5 @@
 module std.induction
+import std.optional { Absent, Present }
 
 import std.termination { DescentEvidence, PositiveDescentAmount, ProportionalDivisor, RankingDimension, peano_literal_materialization_cap, positive_descent_amount_from_positive_int, positive_descent_count, proportional_divisor_from_int_at_least_two, proportional_divisor_to_int, DescentUnknown, DivideByTwo, NonIncreasing, OneStep, Strict, TreeSize }
 
diff --git a/dag/std/integer.dag b/dag/std/integer.dag
index e16fc9bbb8b..f1c24692518 100644
--- a/dag/std/integer.dag
+++ b/dag/std/integer.dag
@@ -1,4 +1,5 @@
 module std.integer
+import std.optional { Absent, Present }
 
 import std.algebra { AbelianGroup, GroupCompletion }
 import std.nat { Nat }
diff --git a/dag/std/keyed_roster.dag b/dag/std/keyed_roster.dag
index f4d3be855b0..9d27bee30b8 100644
--- a/dag/std/keyed_roster.dag
+++ b/dag/std/keyed_roster.dag
@@ -1,4 +1,5 @@
 module std.keyed_roster
+import std.optional { Absent, Present }
 
 import std.types { List, Bool, Int, String }
 import std.keyed_row { KeyedRow, keyed_row_find }
diff --git a/dag/std/keyed_row.dag b/dag/std/keyed_row.dag
index 2ec548d6229..d76ed71ccc1 100644
--- a/dag/std/keyed_row.dag
+++ b/dag/std/keyed_row.dag
@@ -1,4 +1,5 @@
 module std.keyed_row
+import std.optional { Present }
 
 import std.types { List }
 
diff --git a/dag/std/kind.dag b/dag/std/kind.dag
index 3b82f10dfb1..a3a589e75f2 100644
--- a/dag/std/kind.dag
+++ b/dag/std/kind.dag
@@ -6,7 +6,7 @@ import v2.std.collection { empty_map, map_insert, map_lookup }
 import std.types { Map, List }
 import v2.std.node { Atom, Node, Symbol, TypeNode, arrow_signature_order_edge }
 import v2.std.node_query { NamedChildAmbiguous, NamedChildFound, NamedChildMissing, named_child_lookup }
-import v2.std.optional { Optional, optional_absent, optional_present }
+import std.optional { Optional, optional_absent, optional_present }
 
 // THE KIND OF A TYPE-LEVEL NODE, AT ONE LEVEL (Type_0 only, no universe tower). A node that DENOTES
 // a type -- the Int inhabitant, a fn Arrow between inhabitants -- has a type too, and that type is
diff --git a/dag/std/materialization_ladder.dag b/dag/std/materialization_ladder.dag
index b36a9801eff..6f223bf30e8 100644
--- a/dag/std/materialization_ladder.dag
+++ b/dag/std/materialization_ladder.dag
@@ -17,7 +17,7 @@ import std.cache_interface {
   CapacityBounded,
   CapacityUnobserved,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data materialization_ladder_frame_path_predicate_contract: Disposition = Terminal {
   reason: "Structural coproduct/path readers over Frame/FrameKind (frame_eq, frame_path_*, declared_emergent_prefix, string_list_contains) — closed by the ladder's declared frame variants; discriminating corpus: dag/test/claim/materialization_ladder_witness_test.dag."
diff --git a/dag/std/measure.dag b/dag/std/measure.dag
index 05c9b1a6706..23d28e8f09a 100644
--- a/dag/std/measure.dag
+++ b/dag/std/measure.dag
@@ -1,4 +1,5 @@
 module std.measure
+import std.optional { Present }
 
 import std.dissolution { DissolutionCondition, unbound_dissolution }
 
diff --git a/dag/std/nat.dag b/dag/std/nat.dag
index 432a0c53305..a30d59fac1f 100644
--- a/dag/std/nat.dag
+++ b/dag/std/nat.dag
@@ -1,4 +1,5 @@
 module std.nat
+import std.optional { Present }
 
 import std.types { List, Bool }
 import std.algebra { CommutativeMonoid, CommutativeSemiring, Ordering, Less, Equal, Greater }
diff --git a/dag/std/occurrence_identity.dag b/dag/std/occurrence_identity.dag
index 08c37be80e9..8bffd3cbfb8 100644
--- a/dag/std/occurrence_identity.dag
+++ b/dag/std/occurrence_identity.dag
@@ -1,4 +1,5 @@
 module std.occurrence_identity
+import std.optional { Absent, Present }
 
 import std.dissolution { DissolutionCondition, unbound_dissolution }
 
diff --git a/src/v2/std/optional.dag b/dag/std/optional.dag
similarity index 93%
rename from src/v2/std/optional.dag
rename to dag/std/optional.dag
index 52d4c50abc5..f310caa49d1 100644
--- a/src/v2/std/optional.dag
+++ b/dag/std/optional.dag
@@ -1,4 +1,4 @@
-module v2.std.optional
+module std.optional
 
 type Optional<T>
   = Absent
diff --git a/dag/std/orthogonal_topology.dag b/dag/std/orthogonal_topology.dag
index 0a01d8b46bb..6ccd93530ef 100644
--- a/dag/std/orthogonal_topology.dag
+++ b/dag/std/orthogonal_topology.dag
@@ -17,7 +17,7 @@ import std.checked_arithmetic {
   CheckedNat, CheckedNatReady, CheckedNatOverflow,
   checked_int_add, checked_int_subtract, checked_int_multiply, checked_int_magnitude,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.spatial_frame {
   SpatialFrameRegistry, FrameExtent, ExtentInFrame, ExtentFrameUnregistered,
   LengthProjected, LengthProjectionRefused, frame_length_as_millimeter,
diff --git a/dag/std/realization_measurement.dag b/dag/std/realization_measurement.dag
index 736df9aa487..08d3ad4b1fb 100644
--- a/dag/std/realization_measurement.dag
+++ b/dag/std/realization_measurement.dag
@@ -33,7 +33,7 @@ import std.realization_schedule {
   cost_account_measured,
   cost_account_time_count,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // PEAK AND CURRENT ARE DIFFERENT QUESTIONS AND ONLY ONE OF THEM CAN SEE A RELEASE.
 //
diff --git a/dag/std/realization_schedule.dag b/dag/std/realization_schedule.dag
index 018e0ade25f..d1dd05346ab 100644
--- a/dag/std/realization_schedule.dag
+++ b/dag/std/realization_schedule.dag
@@ -1,4 +1,5 @@
 module std.realization_schedule
+import std.optional { Absent, Present }
 
 import std.types { CommitSha, NonEmptyStr, Bool, String, List, Int, brand }
 import std.execution_mode { ExecutionMode, Hermetic, execution_mode_eq }
diff --git a/dag/std/realization_width.dag b/dag/std/realization_width.dag
index a20c785fb28..db03e609e4d 100644
--- a/dag/std/realization_width.dag
+++ b/dag/std/realization_width.dag
@@ -30,7 +30,7 @@ import std.realization_schedule {
   cost_account_predicted_zero,
   cost_account_time_count,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 fn int_min(a: Int, b: Int) -> Int {
   if a < b { a } else { b }
diff --git a/dag/std/scoped_authorization.dag b/dag/std/scoped_authorization.dag
index 9b37a58e3a7..fbf2ffec778 100644
--- a/dag/std/scoped_authorization.dag
+++ b/dag/std/scoped_authorization.dag
@@ -2,7 +2,7 @@ module std.scoped_authorization
 
 import std.types { NonEmptyStr, String, Bool, Timestamp, List, Int, brand }
 import v2.std.algebra { skip, is_empty, length }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash {
   ContentHash,
   ContentHashComparison,
diff --git a/dag/std/source_annotation.dag b/dag/std/source_annotation.dag
index df4c5963bdf..374d51c177c 100644
--- a/dag/std/source_annotation.dag
+++ b/dag/std/source_annotation.dag
@@ -1,4 +1,5 @@
 module std.source_annotation
+import std.optional { Absent, Present }
 // The language-agnostic authority for source annotations, per DESIGN 4c. It names no .dag syntax and no lexical rule: a realization decides what its annotation syntax looks like and routes it through its own annotation channel, then lands rows of THIS shape. Both the v1 seed tokenizer and the v2 modeled tokenizer import from here rather than each minting a placement enum, because two spellings of one concept is the nicknaming defect this whole lane exists to remove.
 
 import std.coercion { unicode_scalar_unfold }
diff --git a/dag/std/termination.dag b/dag/std/termination.dag
index afc2152d335..d7eae4b753b 100644
--- a/dag/std/termination.dag
+++ b/dag/std/termination.dag
@@ -1,4 +1,5 @@
 module std.termination
+import std.optional { Absent, Present }
 
 import std.algebra { BoundedLattice, Ordering }
 import std.types { List, Map }
diff --git a/dag/std/types.dag b/dag/std/types.dag
index d643f3ca002..afad5978851 100644
--- a/dag/std/types.dag
+++ b/dag/std/types.dag
@@ -1,4 +1,5 @@
 module std.types
+import std.optional { Absent, Present }
 
 import std.algebra { FinitePowerSet, FinitelySupportedFunction, FreeMonoid, kernel_algebra_profile, algebra_type_param_names, carrier_container_algebra_rows, carrier_container_alias_rows, carrier_container_arity_rows, carrier_container_roster_map }
 import std.unicode.types { unicode_scalar }
diff --git a/dag/test/claim/algebra_receiver_alias_witness_test.dag b/dag/test/claim/algebra_receiver_alias_witness_test.dag
index 13c99a6b5aa..1e10100c329 100644
--- a/dag/test/claim/algebra_receiver_alias_witness_test.dag
+++ b/dag/test/claim/algebra_receiver_alias_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.algebra_receiver_alias_witness_test
 
 import std.types { Bool, Int, String, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_census_probe { blocking_subject_count_for, total_blocking_count_for }
 
 // These are deliberately source fixtures: the alias spelling is expected to
diff --git a/dag/test/claim/approval_capability_witness_test.dag b/dag/test/claim/approval_capability_witness_test.dag
index c28eefaffea..c02136f424a 100644
--- a/dag/test/claim/approval_capability_witness_test.dag
+++ b/dag/test/claim/approval_capability_witness_test.dag
@@ -1,5 +1,5 @@
 module test.claim.approval_capability_witness_test
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 import gunbc.auth.approval_capability {
diff --git a/dag/test/claim/approval_store_receipt_witness_test.dag b/dag/test/claim/approval_store_receipt_witness_test.dag
index 3058c05112a..81f8aa56e70 100644
--- a/dag/test/claim/approval_store_receipt_witness_test.dag
+++ b/dag/test/claim/approval_store_receipt_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.approval_store_receipt_witness
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, Secret }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.scoped_authorization { AttemptIdentity }
 import extdeps.crypto.mac { MacKey, HmacSha256, MacSigned, mac_sign }
diff --git a/dag/test/claim/arity_zero_import_refusal_witness_test.dag b/dag/test/claim/arity_zero_import_refusal_witness_test.dag
index 49dee4d8d3f..a95c9c0801f 100644
--- a/dag/test/claim/arity_zero_import_refusal_witness_test.dag
+++ b/dag/test/claim/arity_zero_import_refusal_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.arity_zero_import_refusal_witness
 
 import std.types { String, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class }
 
diff --git a/dag/test/claim/artifact_store_witness_test.dag b/dag/test/claim/artifact_store_witness_test.dag
index ce47ff3c897..d7ef8061846 100644
--- a/dag/test/claim/artifact_store_witness_test.dag
+++ b/dag/test/claim/artifact_store_witness_test.dag
@@ -47,7 +47,7 @@ import extdeps.realization.emit_on_demand_host {
   ToolchainIdentityPresent,
   ToolchainIdentityRefusedCrypto,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/dag/test/claim/auth/managed_host_boot_federation_witness_test.dag b/dag/test/claim/auth/managed_host_boot_federation_witness_test.dag
index 5d8a4ae327c..80a0252d3ed 100644
--- a/dag/test/claim/auth/managed_host_boot_federation_witness_test.dag
+++ b/dag/test/claim/auth/managed_host_boot_federation_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.managed_host_boot_federation_witness
 
 import std.types { Bool, List, NonEmptyStr, String }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.fleet_host_identity { operator_host_mtcollins1, operator_host_srv1 }
 import gunbc.managed_host { managed_host_fixture, managed_hosts }
 import gunbc.auth.oidc_claim_pins { OidcClaimPin }
diff --git a/dag/test/claim/auth/profile_store_real_path_witness_test.dag b/dag/test/claim/auth/profile_store_real_path_witness_test.dag
index 51bec4a6137..32fa42d2b5b 100644
--- a/dag/test/claim/auth/profile_store_real_path_witness_test.dag
+++ b/dag/test/claim/auth/profile_store_real_path_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.auth.profile_store_real_path_witness_test
 
 import std.logic { Bool }
 import std.types { String, FilePath, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.shell
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/test/claim/bmc/bmc_wif_delegation_chain_witness_test.dag b/dag/test/claim/bmc/bmc_wif_delegation_chain_witness_test.dag
index 6086dbba036..d17727f6fbb 100644
--- a/dag/test/claim/bmc/bmc_wif_delegation_chain_witness_test.dag
+++ b/dag/test/claim/bmc/bmc_wif_delegation_chain_witness_test.dag
@@ -5,7 +5,7 @@ module test.claim.bmc_wif_delegation_chain_witness
 // optionals they are rather than passed where a value is declared. Each claim's meaning is unchanged.
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { Bool, Int, List, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.cloud.gcp.secret_ref { secret_ref_secret_resource, secret_ref_hash_known }
 import gunbc.auth.secret_access_grant { grant_is_signed, grant_is_legacy }
 import gunbc.auth.secret_ref_credential { secret_ref_credential_authority }
diff --git a/dag/test/claim/bmc/ipmitool_hpm_check_witness_test.dag b/dag/test/claim/bmc/ipmitool_hpm_check_witness_test.dag
index 888166f29ee..3d785bba627 100644
--- a/dag/test/claim/bmc/ipmitool_hpm_check_witness_test.dag
+++ b/dag/test/claim/bmc/ipmitool_hpm_check_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.ipmitool_hpm_check_witness
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.algebra { any, filter }
 import std.types { Bool, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.bmc.ipmitool_observed_output { ipmitool_hpm_check_bmc0_32 }
 import extdeps.bmc.ipmitool_hpm_check {
   HpmCheckTable, HpmCheckRead, HpmCheckUpgradeVariant, HpmCheckUnreadable,
diff --git a/dag/test/claim/bmc_model_web_kvm_witness_test.dag b/dag/test/claim/bmc_model_web_kvm_witness_test.dag
index 2c51aeac002..363158f9aa6 100644
--- a/dag/test/claim/bmc_model_web_kvm_witness_test.dag
+++ b/dag/test/claim/bmc_model_web_kvm_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.bmc_model_web_kvm_witness_test
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { Bool, Int, List, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { second }
 import gunbc.bmc_model {
   BmcWorld, BmcWebWorld, BmcWebAccount, BmcPowerOn, bmc_web_world_untouched, BmcScheduledEvent, BmcKvmStreamClosed, BmcKvmIdle, BmcKvmStreaming, BmcKvmClosedByController,
diff --git a/dag/test/claim/callable_candidate_ambiguity_witness_test.dag b/dag/test/claim/callable_candidate_ambiguity_witness_test.dag
index f37a35cd07c..d7b28191299 100644
--- a/dag/test/claim/callable_candidate_ambiguity_witness_test.dag
+++ b/dag/test/claim/callable_candidate_ambiguity_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.callable_candidate_ambiguity_witness
 
 import std.types { String, Bool, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class }
 import gunbc.compile_diagnostic_census { census_blocking_rows, census_total_count, CensusObserved, CensusNotRunnable }
diff --git a/dag/test/claim/check_removal_residual_witness_test.dag b/dag/test/claim/check_removal_residual_witness_test.dag
index 15420e26577..823bc0e7245 100644
--- a/dag/test/claim/check_removal_residual_witness_test.dag
+++ b/dag/test/claim/check_removal_residual_witness_test.dag
@@ -17,7 +17,7 @@ import gunbc.ci_gate { GeneratedArtifactDriftGate }
 import std.decl_ref { decl_ref }
 import std.types { NonEmptyStr }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/dag/test/claim/class_b_import_closure_binding_refusal_witness_test.dag b/dag/test/claim/class_b_import_closure_binding_refusal_witness_test.dag
index 93c5d11c19c..7957afbbc13 100644
--- a/dag/test/claim/class_b_import_closure_binding_refusal_witness_test.dag
+++ b/dag/test/claim/class_b_import_closure_binding_refusal_witness_test.dag
@@ -10,7 +10,7 @@ import gunbc.declared_import_closure_binding {
   row4_stripped_pool_coincidence_or_refuse
 }
 import gunbc.compile_clean_diagnostic_policy { ListedImport }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.types { Bool, NonEmptyStr }
 
 // Per-PR discovery-admitted unit controls for gunbc.declared_import_closure_binding verdict
diff --git a/dag/test/claim/claude_setup_token_enrollment_witness_test.dag b/dag/test/claim/claude_setup_token_enrollment_witness_test.dag
index 9c714a2943c..6606bc68d8c 100644
--- a/dag/test/claim/claude_setup_token_enrollment_witness_test.dag
+++ b/dag/test/claim/claude_setup_token_enrollment_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.claude_setup_token_enrollment_witness
 
 import std.types { Bool, NonEmptyStr, List, list_length, RenderedTerminalText }
 import std.measure { character_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.llm.claude_setup_token_cli {
   SetupTokenFormatMeasured,
   SetupTokenFormatUnobserved,
diff --git a/dag/test/claim/cloudflare_r2_origin_object_witness_test.dag b/dag/test/claim/cloudflare_r2_origin_object_witness_test.dag
index 065ecaa0583..9d26f0f1628 100644
--- a/dag/test/claim/cloudflare_r2_origin_object_witness_test.dag
+++ b/dag/test/claim/cloudflare_r2_origin_object_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.cloudflare_r2_origin_object
 
 import std.types { Bool, String, NonEmptyStr, List, FilePath, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.decl_ref { decl_ref, DeclarationRef, declaration_ref_eq }
 import std.roster_frontier { FrontierRow, DeclSubject, PathSubject, frontier_rows_well_formed }
 import extdeps.shell.exec { process_observation }
diff --git a/dag/test/claim/colo_cabinet_density_witness_test.dag b/dag/test/claim/colo_cabinet_density_witness_test.dag
index edb72257b6e..2d6d98ad8e6 100644
--- a/dag/test/claim/colo_cabinet_density_witness_test.dag
+++ b/dag/test/claim/colo_cabinet_density_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, Int, List }
 import std.algebra { FreeSemigroup }
 import v2.std.algebra { non_empty_to_list }
 import std.measure { Watt, watt, watt_count, volt_ampere }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.colo.types {
   CabinetDensityClaim, DensityPublished, PublishedDensityFigure, DensityUnread,
diff --git a/dag/test/claim/commit_check_demand_witness_test.dag b/dag/test/claim/commit_check_demand_witness_test.dag
index 4026adf3aa1..d003ceb7705 100644
--- a/dag/test/claim/commit_check_demand_witness_test.dag
+++ b/dag/test/claim/commit_check_demand_witness_test.dag
@@ -34,7 +34,7 @@ import std.realization_schedule {
 }
 import std.types { NonEmptyStr }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data live_tree_disposition: LiveTreeDisposition = ReadsLiveTree
 
diff --git a/dag/test/claim/compiler_gate_workflow_witness_test.dag b/dag/test/claim/compiler_gate_workflow_witness_test.dag
index 39f27215e81..bfee308a79e 100644
--- a/dag/test/claim/compiler_gate_workflow_witness_test.dag
+++ b/dag/test/claim/compiler_gate_workflow_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.compiler_gate_workflow_witness_test
 
 import std.types { Bool, Int, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { fold_list }
 import extdeps.github.actions { Step, RunStep, UsesStep, Job, SelfHosted, RunsOnExpression }
 import gunbc.compiler_gate_workflow {
diff --git a/dag/test/claim/compute_board_truth_table_witness_test.dag b/dag/test/claim/compute_board_truth_table_witness_test.dag
index 0397fdd573c..d0e39997981 100644
--- a/dag/test/claim/compute_board_truth_table_witness_test.dag
+++ b/dag/test/claim/compute_board_truth_table_witness_test.dag
@@ -33,7 +33,7 @@ import product.compute_board.admission {
   admit_board_article,
 }
 import product.compute_board.article { BoardArticleIdentity, power_interlock_article }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/dag/test/claim/contributor_onboarding_path_witness_test.dag b/dag/test/claim/contributor_onboarding_path_witness_test.dag
index 64a11a6873d..9d79eab599c 100644
--- a/dag/test/claim/contributor_onboarding_path_witness_test.dag
+++ b/dag/test/claim/contributor_onboarding_path_witness_test.dag
@@ -52,7 +52,7 @@ import tools.docs_projection_gate {
   docs_projection_producer_coverage_over
 }
 import std.process { ProcessExit, ExitSuccess, ExitFailure }
-import v2.std.optional { Absent }
+import std.optional { Absent }
 import std.types { String, List, NonEmptyStr }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
diff --git a/dag/test/claim/decl_facts_reflection_witness_support.dag b/dag/test/claim/decl_facts_reflection_witness_support.dag
index 16a350cb8b1..8872896540d 100644
--- a/dag/test/claim/decl_facts_reflection_witness_support.dag
+++ b/dag/test/claim/decl_facts_reflection_witness_support.dag
@@ -11,7 +11,7 @@ import test.fixture.decl_facts_reflection.witness_support {
 import v2.std.decl_index { DeclFact }
 import std.types { List }
 import std.algebra { Empty }
-import v2.std.optional { optional_present, optional_absent }
+import std.optional { optional_present, optional_absent }
 import v2.std.data_initializer_identity {
   projection_kind_lexeme_optional,
   projection_named_child_optional,
diff --git a/dag/test/claim/direct_call_argument_type_witness_test.dag b/dag/test/claim/direct_call_argument_type_witness_test.dag
index d34f65a9254..c3130db7eb9 100644
--- a/dag/test/claim/direct_call_argument_type_witness_test.dag
+++ b/dag/test/claim/direct_call_argument_type_witness_test.dag
@@ -17,7 +17,7 @@ import gunbc.guarantee_probe_corpus {
 }
 import std.types { Bool, Int, String }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // THIS MODULE EXISTS BECAUSE ITS ASSERTIONS HAVE TO EXECUTE, AND THE OBVIOUS HOME FOR THEM DID
 // NOT WHILE DeclinedLiveTree stood. The three probes below belong to the guarantee probe corpus
diff --git a/dag/test/claim/duplicate_record_field_refusal_witness_test.dag b/dag/test/claim/duplicate_record_field_refusal_witness_test.dag
index 1effa55e8ce..ccfa8ab9d89 100644
--- a/dag/test/claim/duplicate_record_field_refusal_witness_test.dag
+++ b/dag/test/claim/duplicate_record_field_refusal_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.duplicate_record_field_refusal_witness
 
 import std.types { String, Int, Bool }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class, census_blocking_count_for_subject }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
diff --git a/dag/test/claim/durable_cas_fabric_storage_real_execution_witness_test.dag b/dag/test/claim/durable_cas_fabric_storage_real_execution_witness_test.dag
index 4a9a7625810..4c242e00284 100644
--- a/dag/test/claim/durable_cas_fabric_storage_real_execution_witness_test.dag
+++ b/dag/test/claim/durable_cas_fabric_storage_real_execution_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.durable_cas_fabric_storage_real_execution
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, FilePath }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.shell
 import std.content_hash { content_hash_of_value }
diff --git a/dag/test/claim/durable_exclusive_hold_file_store_wet_witness_test.dag b/dag/test/claim/durable_exclusive_hold_file_store_wet_witness_test.dag
index e3384f6e583..3172ed2d2e3 100644
--- a/dag/test/claim/durable_exclusive_hold_file_store_wet_witness_test.dag
+++ b/dag/test/claim/durable_exclusive_hold_file_store_wet_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.durable_exclusive_hold_file_store_wet_witness
 import extdeps.shell
 import extdeps.filesystem.filesystem_io { Filesystem }
 import std.types { Bool, Int, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.durable_compare_and_set { CasSlotObservation, cas_generation_count }
 import std.durable_exclusive_hold {
   DurableHoldOwnerRef, DurableHoldReleaseRef, DurableHoldReleaseRefusal,
diff --git a/dag/test/claim/durable_exclusive_hold_witness_test.dag b/dag/test/claim/durable_exclusive_hold_witness_test.dag
index 49c7118e0ee..fc2efbd5b7f 100644
--- a/dag/test/claim/durable_exclusive_hold_witness_test.dag
+++ b/dag/test/claim/durable_exclusive_hold_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.durable_exclusive_hold_witness
 
 import std.types { Bool, Int, NonEmptyStr, String }
 import std.content_hash { content_hash_of_value }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.durable_compare_and_set {
   CasExpectation, ExpectSlotAbsent, ExpectSlotGeneration,
   CasSlotObservation, CasObservedReadable, CasObservedUnreadable,
diff --git a/dag/test/claim/effectful_item_kind_collapse_witness_test.dag b/dag/test/claim/effectful_item_kind_collapse_witness_test.dag
index ac5e01df0da..06a70a4950e 100644
--- a/dag/test/claim/effectful_item_kind_collapse_witness_test.dag
+++ b/dag/test/claim/effectful_item_kind_collapse_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.effectful_item_kind_collapse_witness_test
 
 import std.types { String, Bool, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus, CensusObserved, CensusNotRunnable, census_blocking_rows, census_total_count }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class }
 
diff --git a/dag/test/claim/extdeps/apt_package_of_witness_test.dag b/dag/test/claim/extdeps/apt_package_of_witness_test.dag
index 7813edb1c4d..5984cd6d8c4 100644
--- a/dag/test/claim/extdeps/apt_package_of_witness_test.dag
+++ b/dag/test/claim/extdeps/apt_package_of_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.apt_package_of_witness
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.types { Bool, String }
 import extdeps.tools { CliTool, SourceApt, apt_package_of, apt_binary_path_of }
 import extdeps.tools.sshpass { sshpass_cli_tool }
diff --git a/dag/test/claim/extdeps/flashinfer_authority_witness_test.dag b/dag/test/claim/extdeps/flashinfer_authority_witness_test.dag
index 6eb5f97ab28..4879c82833d 100644
--- a/dag/test/claim/extdeps/flashinfer_authority_witness_test.dag
+++ b/dag/test/claim/extdeps/flashinfer_authority_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.extdeps.flashinfer_authority_witness
 
 import std.types { Bool, List, NonEmptyStr, String }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.flashinfer.flashinfer {
   FlashInferWheel, FlashInferAcquisition, FlashInferPublishedRelease, FlashInferSourceRevision,
   FlashInferPyPi, FlashInferProjectStable, FlashInferProjectNightly,
diff --git a/dag/test/claim/extdeps/vllm_kv_group_metadata_witness_test.dag b/dag/test/claim/extdeps/vllm_kv_group_metadata_witness_test.dag
index db80c901602..ae880b1a2e0 100644
--- a/dag/test/claim/extdeps/vllm_kv_group_metadata_witness_test.dag
+++ b/dag/test/claim/extdeps/vllm_kv_group_metadata_witness_test.dag
@@ -6,7 +6,7 @@ import std.measure {
   AttentionLayerCount, attention_layer_count, attention_layer_count_value,
   ByteSize, byte_size, byte_size_count,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.server { VllmSourceRevision, vllm_source_revision, vllm_source_revision_read }
 import extdeps.vllm.kv_layout {
   KvGroupLayout, FullAttention, SlidingWindowAttention, MambaState,
diff --git a/dag/test/claim/fabric/fabric_cell_converge_witness_test.dag b/dag/test/claim/fabric/fabric_cell_converge_witness_test.dag
index a97ad7e296a..6c9b60b41d0 100644
--- a/dag/test/claim/fabric/fabric_cell_converge_witness_test.dag
+++ b/dag/test/claim/fabric/fabric_cell_converge_witness_test.dag
@@ -10,7 +10,7 @@ import gunbc.ownership { Owned }
 import gunbc.runner_slot_allocation { fabric_execution_slot_identities, identity_is_fabric_execution_member }
 import gunbc.runner_slot_desired { gunbc_runner_slot_desired }
 import extdeps.systemd { parse_systemd_cpu_quota_per_sec_show, systemd_cpu_quota_per_sec_identity }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { byte_size_count }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import gunbc.fabric_cell_observation_admission {
diff --git a/dag/test/claim/fabric/fabric_cell_host_root_witness_test.dag b/dag/test/claim/fabric/fabric_cell_host_root_witness_test.dag
index 95fc5fc74fb..f2e0412ca1a 100644
--- a/dag/test/claim/fabric/fabric_cell_host_root_witness_test.dag
+++ b/dag/test/claim/fabric/fabric_cell_host_root_witness_test.dag
@@ -11,7 +11,7 @@ import gunbc.fabric_cell_converge {
   fabric_cell_member_ownership,
   fabric_cell_desired_state_digest,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.build_cache_instance { RunnerSlotIdentity }
 import gunbc.runner_slot_allocation { fabric_execution_slot_identities }
 import gunbc.membership_reconcile { membership_removal_count, membership_refusal_count, membership_write_count }
diff --git a/dag/test/claim/fabric/fabric_control_plane_wet_witness_test.dag b/dag/test/claim/fabric/fabric_control_plane_wet_witness_test.dag
index ce8975e37a3..ad95a36cf0e 100644
--- a/dag/test/claim/fabric/fabric_control_plane_wet_witness_test.dag
+++ b/dag/test/claim/fabric/fabric_control_plane_wet_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.fabric.fabric_control_plane_wet_witness
 import extdeps.shell
 import extdeps.filesystem.filesystem_io { Filesystem }
 import std.types { Bool, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { content_hash_of_value }
 import extdeps.currency.currency { Usd }
 import std.measure { money_amount_micro }
diff --git a/dag/test/claim/fabric/fabric_store_operation_admission_witness_test.dag b/dag/test/claim/fabric/fabric_store_operation_admission_witness_test.dag
index ba0a5c3ce74..f0a3bd52f95 100644
--- a/dag/test/claim/fabric/fabric_store_operation_admission_witness_test.dag
+++ b/dag/test/claim/fabric/fabric_store_operation_admission_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.fabric.fabric_store_operation_admission_witness
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, Secret, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.effect_grant { Grant, Write, NamespacePosition, CodeNameTree }
 import std.scoped_authorization { AttemptIdentity, AuthorizationScope, AuthorizedAction, intent_frame_head }
diff --git a/dag/test/claim/fabric/fci1_bounded_execution_context_witness_test.dag b/dag/test/claim/fabric/fci1_bounded_execution_context_witness_test.dag
index 893b8358b55..7c475d9ff4d 100644
--- a/dag/test/claim/fabric/fci1_bounded_execution_context_witness_test.dag
+++ b/dag/test/claim/fabric/fci1_bounded_execution_context_witness_test.dag
@@ -11,7 +11,7 @@ import gunbc.fci1_bounded_execution_context {
   fci1_bounded_execution_context,
 }
 import gunbc.runner_slot_desired { gunbc_runner_slot_desired }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 test fn finite_byte_size_refuses_zero() -> Bool {
   match finite_byte_size_from_byte_size(size: byte_size(count: 0)) {
diff --git a/dag/test/claim/fabric_blob_witness_test.dag b/dag/test/claim/fabric_blob_witness_test.dag
index 21fc922a9c7..64720373125 100644
--- a/dag/test/claim/fabric_blob_witness_test.dag
+++ b/dag/test/claim/fabric_blob_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.fabric_blob
 
 import std.types { String, NonEmptyStr, Bool, Int, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
 import std.measure { byte_size, measure_count }
 import std.content_hash { sha256_hex_digest, Sha256Digest }
diff --git a/dag/test/claim/fabric_storage_r2_head_witness_test.dag b/dag/test/claim/fabric_storage_r2_head_witness_test.dag
index e0169fdfb96..4c2fd60ae35 100644
--- a/dag/test/claim/fabric_storage_r2_head_witness_test.dag
+++ b/dag/test/claim/fabric_storage_r2_head_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.fabric_storage_r2_head
 
 import std.types { String, NonEmptyStr, Int, Bool, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.fabric_storage {
   FabricObject, FabricObjectRef, fabric_object_ref_of, fabric_object_ref_eq,
   FabricHeadReading, FabricHeadAbsent, FabricHeadAt, ExpectHeadAbsent, ExpectHeadAt,
diff --git a/dag/test/claim/firmware_applicability_and_loop_cause_witness_test.dag b/dag/test/claim/firmware_applicability_and_loop_cause_witness_test.dag
index 6c0be141b61..e9a071edcf1 100644
--- a/dag/test/claim/firmware_applicability_and_loop_cause_witness_test.dag
+++ b/dag/test/claim/firmware_applicability_and_loop_cause_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.firmware_applicability_and_loop_cause_witness_test
 
 import std.types { Bool }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.firmware.types {
   BmcController,
   FirmwareApplicable,
diff --git a/dag/test/claim/firmware_prerequisite_evidence_witness_test.dag b/dag/test/claim/firmware_prerequisite_evidence_witness_test.dag
index 23b8f192fb0..c61abe9c53e 100644
--- a/dag/test/claim/firmware_prerequisite_evidence_witness_test.dag
+++ b/dag/test/claim/firmware_prerequisite_evidence_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.firmware_prerequisite_evidence_witness_test
 
 import std.types { Bool, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.boards.types { AsrockRackAltrad8ud1l2t }
 import extdeps.firmware.types {
   BmcController,
diff --git a/dag/test/claim/fleet/fabric_allocation_store_substrate_witness_test.dag b/dag/test/claim/fleet/fabric_allocation_store_substrate_witness_test.dag
index 5062aa73dd9..94b6a2316db 100644
--- a/dag/test/claim/fleet/fabric_allocation_store_substrate_witness_test.dag
+++ b/dag/test/claim/fleet/fabric_allocation_store_substrate_witness_test.dag
@@ -4,7 +4,7 @@ import gunbc.fleet_converge_scope { FabricAllocationStoreOnly }
 
 import std.types { Bool, String, NonEmptyStr }
 import std.content_hash { serialize_content_hash }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import extdeps.filesystem.filesystem_io {
   filesystem_listing_observation,
   filesystem_entry_presence,
diff --git a/dag/test/claim/fleet/fleet_converge_checkout_pin_witness_test.dag b/dag/test/claim/fleet/fleet_converge_checkout_pin_witness_test.dag
index c698bad7b65..089dee715b0 100644
--- a/dag/test/claim/fleet/fleet_converge_checkout_pin_witness_test.dag
+++ b/dag/test/claim/fleet/fleet_converge_checkout_pin_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.fleet.fleet_converge_checkout_pin_witness_test
 
 import std.types { Bool, String, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.languages.yaml.types { kv, yaml_string }
 import extdeps.github.actions { Workflow, Job, UsesStep, WorkflowDispatch, HostedRunner, UbuntuLatest }
 import extdeps.github.action.upload_artifact { upload_artifact_v6_0_0 }
diff --git a/dag/test/claim/fleet/fleet_converge_launch_environment_scope_witness_test.dag b/dag/test/claim/fleet/fleet_converge_launch_environment_scope_witness_test.dag
index b2c309464d2..6b99fa92444 100644
--- a/dag/test/claim/fleet/fleet_converge_launch_environment_scope_witness_test.dag
+++ b/dag/test/claim/fleet/fleet_converge_launch_environment_scope_witness_test.dag
@@ -51,7 +51,7 @@ import gunbc.live_deploy.desired { deployment_spec_srv1 }
 import gunbc.host_axis_caps { CapMember }
 import gunbc.fleet_host_identity { operator_host_srv3 }
 import std.content_hash { serialize_content_hash }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import gunbc.runner_slot_retirement { SlotRetirementEvidenceAbsent }
 
diff --git a/dag/test/claim/fleet/fleet_converge_launch_scope_non_interference_test.dag b/dag/test/claim/fleet/fleet_converge_launch_scope_non_interference_test.dag
index 915bf996464..411b4d55ef0 100644
--- a/dag/test/claim/fleet/fleet_converge_launch_scope_non_interference_test.dag
+++ b/dag/test/claim/fleet/fleet_converge_launch_scope_non_interference_test.dag
@@ -5,7 +5,7 @@ import gunbc.fleet_converge_terminal { fleet_converge_apply_terminal_wire, Fully
 import std.types { String, Bool, Int, List, NonEmptyStr }
 import product.host_identity { HostIdentity }
 import std.content_hash { serialize_content_hash }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census {
   CompileDiagnosticCensus,
   CensusObserved,
diff --git a/dag/test/claim/fleet/fleet_converge_plan_manifest_witness_test.dag b/dag/test/claim/fleet/fleet_converge_plan_manifest_witness_test.dag
index d7fb22ecc44..bc7161829d9 100644
--- a/dag/test/claim/fleet/fleet_converge_plan_manifest_witness_test.dag
+++ b/dag/test/claim/fleet/fleet_converge_plan_manifest_witness_test.dag
@@ -6,7 +6,7 @@ import gunbc.fleet_converge_terminal { FullyApplied, PartiallyApplied }
 
 import std.types { String, Bool, Int, NonEmptyStr, List, list_length }
 import v2.std.algebra { count_where }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import gunbc.actions_run_binding { ActionsRunBinding }
 import gunbc.fleet_converge_receipt { FleetConvergePlanReceipt }
diff --git a/dag/test/claim/fleet/fleet_wireless_link_witness_test.dag b/dag/test/claim/fleet/fleet_wireless_link_witness_test.dag
index def47d083f4..05448bc9b0c 100644
--- a/dag/test/claim/fleet/fleet_wireless_link_witness_test.dag
+++ b/dag/test/claim/fleet/fleet_wireless_link_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.fleet.fleet_wireless_link_witness
 
 import std.types { Bool, Int, List, String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.upsert_decision { UpsertDecision, Noop, Apply, Refuse }
 import extdeps.iw {
   IwPowerSaveOn, IwPowerSaveOff, IwPowerSaveReadValue, IwPowerSaveUnreadable, iw_power_save_of_getter,
diff --git a/dag/test/claim/fleet/mtcollins_firmware_converge_witness_test.dag b/dag/test/claim/fleet/mtcollins_firmware_converge_witness_test.dag
index 56384fd2dfd..1a23f184beb 100644
--- a/dag/test/claim/fleet/mtcollins_firmware_converge_witness_test.dag
+++ b/dag/test/claim/fleet/mtcollins_firmware_converge_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.mtcollins_firmware_converge_witness
 
 import std.types { Bool, EpochMs, Int, List, NonEmptyStr, String, list_length }
 import std.measure { second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.upsert_decision { Apply }
 import extdeps.crypto.hash { Digest, sha256_digest }
 import extdeps.standards.picmg_hpm1 { HpmUpgradeCompleted, HpmUpgradeFailed, HpmActivateFirmware }
diff --git a/dag/test/claim/fleet/mtcollins_firmware_readback_route_witness_test.dag b/dag/test/claim/fleet/mtcollins_firmware_readback_route_witness_test.dag
index c57c28d7275..28d21bca4f4 100644
--- a/dag/test/claim/fleet/mtcollins_firmware_readback_route_witness_test.dag
+++ b/dag/test/claim/fleet/mtcollins_firmware_readback_route_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.mtcollins_firmware_readback_route_witness
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { Bool, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.firmware.types { MainboardCpld, HostBios, BmcController }
 import extdeps.bmc.ipmitool_observed_output { ipmitool_hpm_check_bmc0_32, ipmitool_hpm_upgrade_cpld_row_bmc0_45_3, ipmitool_hpm_upgrade_app_row_bmc0_45_3 }
 import extdeps.bmc.ipmitool_hpm_check { HpmCheckTable, hpm_check_table_of }
diff --git a/dag/test/claim/floor/floor_discovery_hand_rust_equivalence_witness_test.dag b/dag/test/claim/floor/floor_discovery_hand_rust_equivalence_witness_test.dag
index ad2a077275a..1ee240fd165 100644
--- a/dag/test/claim/floor/floor_discovery_hand_rust_equivalence_witness_test.dag
+++ b/dag/test/claim/floor/floor_discovery_hand_rust_equivalence_witness_test.dag
@@ -39,7 +39,7 @@ import std.decl_ref { DeclarationRef, WholeDeclaration }
 import v2.std.collection {
   fold_list
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/dag/test/claim/gcp_estate_census_witness_test.dag b/dag/test/claim/gcp_estate_census_witness_test.dag
index 98a56a20c14..49605151339 100644
--- a/dag/test/claim/gcp_estate_census_witness_test.dag
+++ b/dag/test/claim/gcp_estate_census_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.gcp_estate_census_witness
 
 import std.types { Bool, String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.upsert_decision { UpsertClassification, Converged, Noop, Refuse, Conflict, Inaccessible, Drifted, Apply }
 import extdeps.cloud.gcp.gcp { GcpProjectId, ServiceAccountEmail }
diff --git a/dag/test/claim/gcp_iam_converge_witness_test.dag b/dag/test/claim/gcp_iam_converge_witness_test.dag
index 8e0cb65d5fe..f6d3f3a8146 100644
--- a/dag/test/claim/gcp_iam_converge_witness_test.dag
+++ b/dag/test/claim/gcp_iam_converge_witness_test.dag
@@ -4,7 +4,7 @@ import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { Bool, Int, List, NonEmptyStr, String, Timestamp }
 import std.scoped_authorization { AttemptIdentity, AuthorizationRequest }
 import std.content_hash { Sha256Digest }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.cloud.gcp.iam { GcpPolicy, GcpBinding, GcpIamBindingCell }
 import gunbc.auth.approval_decision_store { request_revision_of }
 import gunbc.auth.heal_publisher_provision { DedicatedFederation, FederationClassification, FederationClassified, FederationUnclassified, heal_publisher_dedicated_federation, impersonation_cell }
diff --git a/dag/test/claim/gcp_secret_access_witness_test.dag b/dag/test/claim/gcp_secret_access_witness_test.dag
index 5131203852e..c779ce6f72d 100644
--- a/dag/test/claim/gcp_secret_access_witness_test.dag
+++ b/dag/test/claim/gcp_secret_access_witness_test.dag
@@ -31,7 +31,7 @@ import gunbc.auth.fleet_secret_accessor_roster {
 import gunbc.spark.secret_access_ensure { spark_secret_access_grant }
 import std.types { String, List }
 import std.logic { Bool }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data convergence_member: String = "serviceAccount:fleet-cloud-convergence@gunbai-secrets.iam.gserviceaccount.com"
 
diff --git a/dag/test/claim/generic_effectful_declaration_wall_witness_test.dag b/dag/test/claim/generic_effectful_declaration_wall_witness_test.dag
index 0c29853a8e5..3fa376424ec 100644
--- a/dag/test/claim/generic_effectful_declaration_wall_witness_test.dag
+++ b/dag/test/claim/generic_effectful_declaration_wall_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.generic_effectful_declaration_wall_witness_test
 
 import std.types { String, Bool, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus, CensusObserved, CensusNotRunnable, census_blocking_rows, census_total_count }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class }
 
diff --git a/dag/test/claim/generic_lambda_parameter_binding_witness_test.dag b/dag/test/claim/generic_lambda_parameter_binding_witness_test.dag
index 290b6dcec51..8383a869119 100644
--- a/dag/test/claim/generic_lambda_parameter_binding_witness_test.dag
+++ b/dag/test/claim/generic_lambda_parameter_binding_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.generic_lambda_parameter_binding_witness
 
 import std.types { String, Bool, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class }
 
diff --git a/dag/test/claim/guarantee_floor_class_probe_witness_test.dag b/dag/test/claim/guarantee_floor_class_probe_witness_test.dag
index 02dde25f09f..fa09696946c 100644
--- a/dag/test/claim/guarantee_floor_class_probe_witness_test.dag
+++ b/dag/test/claim/guarantee_floor_class_probe_witness_test.dag
@@ -48,7 +48,7 @@ import gunbc.guarantee_measurement { GuaranteeProbeId, MeasurementRevision }
 import std.types { String, NonEmptyStr, Bool, Int, List }
 import v2.std.algebra { fold_list }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data live_tree_disposition: LiveTreeDisposition = ReadsLiveTree
 
diff --git a/dag/test/claim/guarantee_probe_corpus_witness_test.dag b/dag/test/claim/guarantee_probe_corpus_witness_test.dag
index 92bcc5bbdc3..90f9ac3bde0 100644
--- a/dag/test/claim/guarantee_probe_corpus_witness_test.dag
+++ b/dag/test/claim/guarantee_probe_corpus_witness_test.dag
@@ -94,7 +94,7 @@ import gunbc.compile_diagnostic_census {
 import std.types { String, NonEmptyStr, Bool, Int, List }
 import v2.std.algebra { fold_list }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data live_tree_disposition: LiveTreeDisposition = ReadsLiveTree
 
diff --git a/dag/test/claim/harness_chat_shape_test.dag b/dag/test/claim/harness_chat_shape_test.dag
index da096f92b42..fa445b584c7 100644
--- a/dag/test/claim/harness_chat_shape_test.dag
+++ b/dag/test/claim/harness_chat_shape_test.dag
@@ -17,7 +17,7 @@ import gunbc.serving.serving_enrollment {
   ServingRouteResolved, ServingRouteUnresolved, serving_route_endpoint_wire,
 }
 import gunbc.spark.fabric_serving_assignment { FabricServingHeadResolved, FabricServingHeadRefused }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.fleet_intent_network { host_lan_address }
 import gunbc.harness.harness_turn {
   HarnessToolResult, harness_assistant_message_json, harness_tool_result_messages_json,
diff --git a/dag/test/claim/harness_turn_admission_witness_test.dag b/dag/test/claim/harness_turn_admission_witness_test.dag
index 0bc91a9658b..0409edfcfeb 100644
--- a/dag/test/claim/harness_turn_admission_witness_test.dag
+++ b/dag/test/claim/harness_turn_admission_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.harness_turn_admission_witness
 import std.types { Bool, NonEmptyStr, String }
 import std.decl_ref { decl_ref }
 import std.measure { token_count, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.fabric.provider_route { ProviderRoute }
 import product.fabric.isolation { IsolationProfile }
 import product.fabric.work { TrustDomainRef, OfferedService, MaterializedProgram }
diff --git a/dag/test/claim/heal_candidate_witness_test.dag b/dag/test/claim/heal_candidate_witness_test.dag
index 0eb2b6fb75a..0628ae5d9cb 100644
--- a/dag/test/claim/heal_candidate_witness_test.dag
+++ b/dag/test/claim/heal_candidate_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.heal_candidate_witness
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.types { String, NonEmptyStr, Bool }
 import std.content_hash { Sha1Digest, Sha1DigestHex }
 import extdeps.git.object_store {
diff --git a/dag/test/claim/heal_publication_boundary_witness_test.dag b/dag/test/claim/heal_publication_boundary_witness_test.dag
index dfff8751706..d42e6c14210 100644
--- a/dag/test/claim/heal_publication_boundary_witness_test.dag
+++ b/dag/test/claim/heal_publication_boundary_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.heal_publication_boundary_witness
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.types { String, NonEmptyStr, Bool, Int, CommitSha, List }
 import std.content_hash { Sha1Digest, Sha1DigestHex }
 import extdeps.github.effect { RepositoryPath }
diff --git a/dag/test/claim/heal_publication_workflow_witness_test.dag b/dag/test/claim/heal_publication_workflow_witness_test.dag
index 9859558c2cf..760ab0192fb 100644
--- a/dag/test/claim/heal_publication_workflow_witness_test.dag
+++ b/dag/test/claim/heal_publication_workflow_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.heal_publication_workflow_witness
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.types { String, NonEmptyStr, Bool, List, Int }
 import extdeps.languages.yaml.types { YamlValue, YamlKeyValue, YamlString, YamlNull, YamlBool, YamlInt, YamlFloat, YamlSequence, YamlMapping, yaml_string, yaml_bool, kv }
 import extdeps.github.actions {
diff --git a/dag/test/claim/heal_publisher_provision_witness_test.dag b/dag/test/claim/heal_publisher_provision_witness_test.dag
index ec9c59dcd45..59b28163ca3 100644
--- a/dag/test/claim/heal_publisher_provision_witness_test.dag
+++ b/dag/test/claim/heal_publisher_provision_witness_test.dag
@@ -18,7 +18,7 @@ import gunbc.auth.heal_publisher_provision {
 }
 import extdeps.cloud.gcp.gcp { WifPoolWire, WifProviderWire, WifOidcWire }
 import gunbc.auth.github_gcp_federation { github_wif_issuer_uri }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.transports.rest { RestResponseObserved, RestBodyRead, RestBodyUndecodable }
 import v2.std.witness_evaluation { WitnessReturned, WitnessRefused, evaluate_in_witness_frame }
 import test.claim.rest_exchange_replay_test { replay_frame, fixture_for }
diff --git a/dag/test/claim/host/host_boot_attempt_admission_witness_test.dag b/dag/test/claim/host/host_boot_attempt_admission_witness_test.dag
index 2414dde5b5d..f99d566cd75 100644
--- a/dag/test/claim/host/host_boot_attempt_admission_witness_test.dag
+++ b/dag/test/claim/host/host_boot_attempt_admission_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.host_boot_attempt_admission_witness
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.algebra { any }
 import std.types { Bool, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.crypto.hash { sha256_digest }
 import extdeps.tools.sha256sum { Sha256FileDigest, Sha256FileDigestUnavailable }
 import extdeps.ampere.mt_collins_getting_started_guide.dimm_layout { dimm_figure_banks }
diff --git a/dag/test/claim/host/host_cli_dependency_wet_witness_test.dag b/dag/test/claim/host/host_cli_dependency_wet_witness_test.dag
index f0fdc57c624..0afee95b8f4 100644
--- a/dag/test/claim/host/host_cli_dependency_wet_witness_test.dag
+++ b/dag/test/claim/host/host_cli_dependency_wet_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.host_cli_dependency_wet_witness_test
 import extdeps.tools.gnu_coreutils { true_program }
 
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.types { Bool, NonEmptyStr }
 import extdeps.tools { CliTool, SourceCoreutils }
 import extdeps.tools.npm { npm_cli_tool }
diff --git a/dag/test/claim/host/host_cli_dependency_witness_test.dag b/dag/test/claim/host/host_cli_dependency_witness_test.dag
index 79579b7b5ba..27b2eec2074 100644
--- a/dag/test/claim/host/host_cli_dependency_witness_test.dag
+++ b/dag/test/claim/host/host_cli_dependency_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.host_cli_dependency_witness_test
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.types { Bool, String, NonEmptyStr }
 import extdeps.tools { install_hint }
 import extdeps.tools.sshpass { sshpass_cli_tool }
diff --git a/dag/test/claim/host/managed_host_unit_hold_witness_test.dag b/dag/test/claim/host/managed_host_unit_hold_witness_test.dag
index 714bbc7f52f..60fff575274 100644
--- a/dag/test/claim/host/managed_host_unit_hold_witness_test.dag
+++ b/dag/test/claim/host/managed_host_unit_hold_witness_test.dag
@@ -32,7 +32,7 @@ import gunbc.managed_host_unit_hold {
   unit_hold_store_executor_decision, unit_hold_store_executor_refusal,
   UnitHoldOnStoreHost, UnitHoldNotOnStoreHost, unit_hold_store_executor,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.build_cache_instance { ProcessIdentity }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/dag/test/claim/host/megarac_managed_host_witness_test.dag b/dag/test/claim/host/megarac_managed_host_witness_test.dag
index 2259a7d90ad..756a513c1bd 100644
--- a/dag/test/claim/host/megarac_managed_host_witness_test.dag
+++ b/dag/test/claim/host/megarac_managed_host_witness_test.dag
@@ -14,7 +14,7 @@ import extdeps.boards.types { BaseboardModel, GigabyteMp72Hb0 }
 import std.types { EpochMs }
 import std.content_hash { Sha256Digest, Sha256Hash }
 import std.decl_ref { decl_ref }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.machine_intake_receipt { EvidenceRef }
 import gunbc.megarac_operation_standing { MegaRacOperationEvidence, megarac_operation_evidence_of, megarac_build_reading, megarac_operation_receipt, megarac_firmware_transition }
 import gunbc.megarac_managed_host { MegaRacHostAdmission, MegaRacHostAdmitted, MegaRacHostRefused, MegaRacHostNotManaged, MegaRacHostNotBound, MegaRacHostNotMegaRac, MegaRacOperationNotGrounded, MegaRacObservationNotCurrent, admit_megarac_host, megarac_host_admission_in, megarac_host_refusal_text }
diff --git a/dag/test/claim/infer_record_field_completeness_zero_field_witness_test.dag b/dag/test/claim/infer_record_field_completeness_zero_field_witness_test.dag
index c434a9cd44a..117fc861e2b 100644
--- a/dag/test/claim/infer_record_field_completeness_zero_field_witness_test.dag
+++ b/dag/test/claim/infer_record_field_completeness_zero_field_witness_test.dag
@@ -16,7 +16,7 @@ import gunbc.compile_diagnostic_census {
 import gunbc.guarantee_measurement { GuaranteeProbeId }
 import std.types { String, Bool, Int }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data live_tree_disposition: LiveTreeDisposition = ReadsLiveTree
 
diff --git a/dag/test/claim/instrument_sandbox_witness_test.dag b/dag/test/claim/instrument_sandbox_witness_test.dag
index dd68ad8aafa..14aa9cfe8cb 100644
--- a/dag/test/claim/instrument_sandbox_witness_test.dag
+++ b/dag/test/claim/instrument_sandbox_witness_test.dag
@@ -31,7 +31,7 @@ import gunbc.roadmap_program_view {
 }
 import gunbc.v1_deletion_plan { V1FinishLine, CompilerFixedPoint }
 import gunbc.roadmap_model { RoadmapNodeId }
-import v2.std.optional { Absent }
+import std.optional { Absent }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/dag/test/claim/instruments/instrument_dispatch_workflow_witness_test.dag b/dag/test/claim/instruments/instrument_dispatch_workflow_witness_test.dag
index c8bff3e9b17..f97e7d99f07 100644
--- a/dag/test/claim/instruments/instrument_dispatch_workflow_witness_test.dag
+++ b/dag/test/claim/instruments/instrument_dispatch_workflow_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.instruments.instrument_dispatch_workflow_witness_test
 import std.types { Bool, List, String }
 import v2.std.algebra { length }
 import extdeps.github.actions { Step, RunStep, UsesStep }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import gunbc.instrument_dispatch_workflow {
   instrument_dispatch_steps, instrument_dispatch_seed_step_name,
   InstrumentDispatchWorkflowGenerated, InstrumentDispatchWorkflowGenerationRefused,
diff --git a/dag/test/claim/job_admission_witness_test.dag b/dag/test/claim/job_admission_witness_test.dag
index 67428f1046a..045833853c8 100644
--- a/dag/test/claim/job_admission_witness_test.dag
+++ b/dag/test/claim/job_admission_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, NonEmptyStr }
 import std.roster_frontier { FrontierRow }
 import gunbc.census_closure_frontier { census_closure_frontier_rows }
 import std.measure { MoneyAmountMicro, money_amount_micro, money_amount_micro_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import product.fabric.identity { FabricIdentity, WorkKey, fabric_identity_eq }
 import product.fabric.job_admission {
diff --git a/dag/test/claim/legacy_binding_projection_witness_test.dag b/dag/test/claim/legacy_binding_projection_witness_test.dag
index c77e00ad4df..147425b40e5 100644
--- a/dag/test/claim/legacy_binding_projection_witness_test.dag
+++ b/dag/test/claim/legacy_binding_projection_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.legacy_binding_projection_witness
 
 import std.types { String, Bool, Int, List, SourceSpan }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.content_hash { Fnv1a64Structural, structural_content_hash }
 import std.decl_ref { DeclarationRef, decl_ref }
diff --git a/dag/test/claim/legacy_repair_tap_live_bridge_witness_test.dag b/dag/test/claim/legacy_repair_tap_live_bridge_witness_test.dag
index 81e0f0f0f5c..cc7b016ba86 100644
--- a/dag/test/claim/legacy_repair_tap_live_bridge_witness_test.dag
+++ b/dag/test/claim/legacy_repair_tap_live_bridge_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.legacy_repair_tap_live_bridge_witness
 
 import std.types { String, Bool, List, list_length }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { structural_content_hash }
 import std.decl_ref { decl_ref }
 import gunbc.whole_corpus_compile_admission { whole_corpus_compile_repository }
diff --git a/dag/test/claim/linux_edac_topology_authority_witness_test.dag b/dag/test/claim/linux_edac_topology_authority_witness_test.dag
index 182966e0d46..f3b9468816e 100644
--- a/dag/test/claim/linux_edac_topology_authority_witness_test.dag
+++ b/dag/test/claim/linux_edac_topology_authority_witness_test.dag
@@ -32,7 +32,7 @@ import extdeps.linux.kernel { LinuxKernelModuleName }
 import std.measure { memory_controller_count_value }
 import std.types { Bool }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/dag/test/claim/live_deploy/apply_emission_projection.dag b/dag/test/claim/live_deploy/apply_emission_projection.dag
index 1164061c18e..499ac26645c 100644
--- a/dag/test/claim/live_deploy/apply_emission_projection.dag
+++ b/dag/test/claim/live_deploy/apply_emission_projection.dag
@@ -10,7 +10,7 @@ import v2.std.orchestration {
   Pipeline, Predicate, ExitZero, LogMatches, StrEq, StrEmpty, StrNonempty, IntNe, Not, And, Or,
   ValueSource, CmdSubstLines, Glob, ModeledList, Expr, ExprLit, ExprVarRef, ExprCmdSubst,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // THE APPLY'S OWN STEP EMISSION, WITH THE HOST OBSERVATION MOCKED AND NOTHING ELSE CHANGED.
 //
diff --git a/dag/test/claim/live_deploy/readiness_witness_test.dag b/dag/test/claim/live_deploy/readiness_witness_test.dag
index 8febf9e50ea..c11fa5e6ca1 100644
--- a/dag/test/claim/live_deploy/readiness_witness_test.dag
+++ b/dag/test/claim/live_deploy/readiness_witness_test.dag
@@ -35,7 +35,7 @@ import gunbc.live_deploy.service_ready {
 }
 import gunbc.live_deploy.spec { deployment_plan_listen_port }
 import gunbc.live_deploy.desired { deployment_spec_srv1 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.ci_deploy_access { ci_deploy_srv1_access }
 import gunbc.host_effect {
   LocalShell,
diff --git a/dag/test/claim/long/fleet_release_bins_key_witness_test.dag b/dag/test/claim/long/fleet_release_bins_key_witness_test.dag
index d8dd42cbfa5..2322dfc6df3 100644
--- a/dag/test/claim/long/fleet_release_bins_key_witness_test.dag
+++ b/dag/test/claim/long/fleet_release_bins_key_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.long.fleet_release_bins_key_witness
 
 import std.types { String, List, Bool }
 import v2.std.node { Node }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.diagnostic { Outcome }
 import extdeps.shell.exec { TransportScript }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
diff --git a/dag/test/claim/machine_intake/ampere_nvparam_console_observation_witness_test.dag b/dag/test/claim/machine_intake/ampere_nvparam_console_observation_witness_test.dag
index 6cd3115e431..4600709c3f1 100644
--- a/dag/test/claim/machine_intake/ampere_nvparam_console_observation_witness_test.dag
+++ b/dag/test/claim/machine_intake/ampere_nvparam_console_observation_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.machine_intake.ampere_nvparam_console_observation_witness_test
 
 import std.types { Bool, Int, List, String }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present }
+import std.optional { Present }
 import v2.std.algebra { filter }
 import extdeps.ampere.nvparam { NvParamKeyDefined, NvParamKeyUndefined, nvparam_key_in, nvparam_key_index, nvparam_keys }
 import gunbc.machine_intake_ampere_nvparam_console_observation {
diff --git a/dag/test/claim/machine_intake/ampere_smpro_observation_witness_test.dag b/dag/test/claim/machine_intake/ampere_smpro_observation_witness_test.dag
index d127e8639b5..6f5acc32c80 100644
--- a/dag/test/claim/machine_intake/ampere_smpro_observation_witness_test.dag
+++ b/dag/test/claim/machine_intake/ampere_smpro_observation_witness_test.dag
@@ -4,7 +4,7 @@ import v2.std.algebra { filter, any }
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus, CompileDiagnosticCensusRow, CensusObserved, CensusNotRunnable }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.bmc.ipmi_master_write_read {
   MasterWriteReadBus, PrivateBus, PublicBus, CompletionNakOnWrite,
   master_write_read_bus_byte, master_write_read_slave_byte,
diff --git a/dag/test/claim/machine_intake/ampere_socket_console_observation_witness_test.dag b/dag/test/claim/machine_intake/ampere_socket_console_observation_witness_test.dag
index d4f5e6abaee..427a27ca0c6 100644
--- a/dag/test/claim/machine_intake/ampere_socket_console_observation_witness_test.dag
+++ b/dag/test/claim/machine_intake/ampere_socket_console_observation_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.machine_intake.ampere_socket_console_observation_witness_test
 import std.types { Bool, Int, List, String }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.ampere.ras_error_section {
   AmpereRasGic, AmpereRasPmproFw, AmpereRasBert, AmperePayloadFirmwareSpecific, AmpereRasTypeUndefined,
   ampere_ras_section_header_of, AmpereRasTypeDefined,
diff --git a/dag/test/claim/machine_intake/host_resource_observation_witness_test.dag b/dag/test/claim/machine_intake/host_resource_observation_witness_test.dag
index 52f675e90b4..728892a80b6 100644
--- a/dag/test/claim/machine_intake/host_resource_observation_witness_test.dag
+++ b/dag/test/claim/machine_intake/host_resource_observation_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, Int, List, String }
 import std.nat { Nat }
 import std.measure { hardware_thread_count, hardware_thread_count_value, kibibyte, byte_size }
 import std.goal_assessment { GoalSatisfied, GoalDiverged, GoalIndeterminate, ObservationEstablished, ObservationRefused }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.algebra { non_empty_to_list }
 import extdeps.toolchain.types { Aarch64 }
 import product.fabric.envelope { cpu_memory_envelope }
diff --git a/dag/test/claim/machine_intake/megarac_kvm_still_witness_test.dag b/dag/test/claim/machine_intake/megarac_kvm_still_witness_test.dag
index b9f74c73eff..635ddb0bb6c 100644
--- a/dag/test/claim/machine_intake/megarac_kvm_still_witness_test.dag
+++ b/dag/test/claim/machine_intake/megarac_kvm_still_witness_test.dag
@@ -4,7 +4,7 @@ import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.nat { Nat }
 import std.measure { second, millisecond, millisecond_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { any }
 import extdeps.crypto.hash { sha256_digest }
 import extdeps.tools.sha256sum { Sha256FileDigest, Sha256FileDigestUnavailable }
diff --git a/dag/test/claim/machine_intake/megarac_sensor_observation_witness_test.dag b/dag/test/claim/machine_intake/megarac_sensor_observation_witness_test.dag
index d8199446f91..dcb9eb7f44d 100644
--- a/dag/test/claim/machine_intake/megarac_sensor_observation_witness_test.dag
+++ b/dag/test/claim/machine_intake/megarac_sensor_observation_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.machine_intake.megarac_sensor_observation_witness_test
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.bmc.ipmi_sdr { SdrLineResult, SdrLineDecoded, SdrTypeLine, sdr_decode_lines }
 import gunbc.machine_intake_mtcollins1_32dimm_bringup_observation { mtcollins1_sdr_capture }
 import gunbc.machine_intake_megarac_sensor_observation {
diff --git a/dag/test/claim/machine_intake/megarac_ui_features_witness_test.dag b/dag/test/claim/machine_intake/megarac_ui_features_witness_test.dag
index c7486477546..247f574d707 100644
--- a/dag/test/claim/machine_intake/megarac_ui_features_witness_test.dag
+++ b/dag/test/claim/machine_intake/megarac_ui_features_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.machine_intake.megarac_ui_features_witness_test
 
 import std.types { Bool, List, NonEmptyStr, String }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { any }
 import extdeps.bmc.megarac { megarac_ui_features_json, megarac_firmware_0_32 }
 import extdeps.external_authority { TranscribedUncited }
diff --git a/dag/test/claim/machine_intake/mtcollins1_boot_diagnostic_bundle_witness_test.dag b/dag/test/claim/machine_intake/mtcollins1_boot_diagnostic_bundle_witness_test.dag
index c38f775eb66..aa9c8ae2cd3 100644
--- a/dag/test/claim/machine_intake/mtcollins1_boot_diagnostic_bundle_witness_test.dag
+++ b/dag/test/claim/machine_intake/mtcollins1_boot_diagnostic_bundle_witness_test.dag
@@ -10,7 +10,7 @@ import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.goal_assessment { ObservationEstablished, ObservationRefused }
 import std.process { ExitSuccess, ExitFailure, exit_failure }
 import gunbc.host_boot_attempt_admission { attempt_configuration_not_recorded }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.bmc.redfish_memory_inventory {
   RedfishMemoryMember, RedfishProcessorMember, StateAbsent, StateEnabled, StateUnrecognized, HealthOk, HealthCritical,
   redfish_memory_member_of, redfish_processor_member_of,
diff --git a/dag/test/claim/machine_intake/mtcollins1_boot_phase_timing_witness_test.dag b/dag/test/claim/machine_intake/mtcollins1_boot_phase_timing_witness_test.dag
index 1a0bdb950ed..62813db270f 100644
--- a/dag/test/claim/machine_intake/mtcollins1_boot_phase_timing_witness_test.dag
+++ b/dag/test/claim/machine_intake/mtcollins1_boot_phase_timing_witness_test.dag
@@ -6,7 +6,7 @@ import std.nat { Nat }
 import std.measure { Millisecond, millisecond, millisecond_count, measure_sub, MeasureDifference, MeasureSubtrahendExceedsMinuend }
 import std.realization_measurement { time_measure_list_total }
 import v2.std.algebra { skip }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.linux.proc_uptime { ProcUptimeRead, UptimeObserved, UptimeRefused, proc_uptime_parse, proc_uptime_read }
 import gunbc.machine_intake_oob_boot_handoff { PoweredOn, PowerCycled }
 import gunbc.machine_intake_ampere_smpro_observation { SmproProbeRaw, smpro_probe_outcome }
diff --git a/dag/test/claim/machine_intake/mtcollins1_boot_run_witness_test.dag b/dag/test/claim/machine_intake/mtcollins1_boot_run_witness_test.dag
index 6c15a4e3d68..e696cc26c35 100644
--- a/dag/test/claim/machine_intake/mtcollins1_boot_run_witness_test.dag
+++ b/dag/test/claim/machine_intake/mtcollins1_boot_run_witness_test.dag
@@ -10,7 +10,7 @@ import gunbc.machine_intake_mtcollins1_boot_run { mtcollins1_boot_ipmi_read_boun
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import std.measure { byte_size_count, second_count, minute_count, hardware_thread_count, hardware_thread_count_value, millisecond, second }
-import v2.std.optional { Present }
+import std.optional { Present }
 import gunbc.machine_intake_oob_boot_handoff { oob_power_readback_allowance }
 import gunbc.machine_intake_mtcollins1_boot_run {
   ActuationNotPoweredOn, ActuationPoweredOn, ActuationCensusEnded, mtcollins1_boot_run_record,
diff --git a/dag/test/claim/machine_intake/mtcollins1_census_image_publish_witness_test.dag b/dag/test/claim/machine_intake/mtcollins1_census_image_publish_witness_test.dag
index 6cece319ee9..a2f0a85b817 100644
--- a/dag/test/claim/machine_intake/mtcollins1_census_image_publish_witness_test.dag
+++ b/dag/test/claim/machine_intake/mtcollins1_census_image_publish_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.machine_intake.mtcollins1_census_image_publish_witness_test
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { Bool, NonEmptyStr, String }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.provisioning.ubuntu_seeded_install_media_remaster { SeededInstallMediaStageOutcome, SeededInstallMediaStaged, SeededInstallMediaStageRefused }
 import extdeps.provisioning.ubuntu_seeded_install_media { UbuntuSeededInstallMediaBuilt, ubuntu_seeded_install_media_built }
 import gunbc.host_command_binding { Removed, RemovalUnconfirmed, CreationNotRequested, CreationUnconfirmed, HostFileWriteNotConverged, HostFileWriteRefused }
diff --git a/dag/test/claim/machine_intake/mtcollins1_census_refusal_hypotheses_witness_test.dag b/dag/test/claim/machine_intake/mtcollins1_census_refusal_hypotheses_witness_test.dag
index c60ce89ac6a..611cb809b59 100644
--- a/dag/test/claim/machine_intake/mtcollins1_census_refusal_hypotheses_witness_test.dag
+++ b/dag/test/claim/machine_intake/mtcollins1_census_refusal_hypotheses_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.machine_intake.mtcollins1_census_refusal_hypotheses_witness_te
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { Bool, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.machine_intake_mtcollins1_census_refusal_hypotheses {
   CensusBootCapture, DefaultPlacement, ConstrainedPlacement,
   census_boot_reading, refusal_recurrence,
diff --git a/dag/test/claim/machine_intake/mtcollins1_kvm_observer_protocol_wet_witness_test.dag b/dag/test/claim/machine_intake/mtcollins1_kvm_observer_protocol_wet_witness_test.dag
index 704a03e2068..18f9de267dc 100644
--- a/dag/test/claim/machine_intake/mtcollins1_kvm_observer_protocol_wet_witness_test.dag
+++ b/dag/test/claim/machine_intake/mtcollins1_kvm_observer_protocol_wet_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, FilePath, Int, List, NonEmptyStr, String }
 import std.algebra { trim }
 import std.nat { Nat }
 import std.measure { second, millisecond_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.shell
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.tools.sleep { sleep_delay_seconds_second_carrier_projection }
diff --git a/dag/test/claim/machine_intake/mtcollins1_power_on_account_witness_test.dag b/dag/test/claim/machine_intake/mtcollins1_power_on_account_witness_test.dag
index c5b7b5f4193..0727ab70044 100644
--- a/dag/test/claim/machine_intake/mtcollins1_power_on_account_witness_test.dag
+++ b/dag/test/claim/machine_intake/mtcollins1_power_on_account_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.machine_intake.mtcollins1_power_on_account_witness_test
 import v2.std.algebra { any }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { Bool, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.crypto.hash { sha256_digest }
 import extdeps.tools.sha256sum { Sha256FileDigest, Sha256FileDigestUnavailable }
 import extdeps.bootloader.grub { grub_console_report, grub_error_text }
diff --git a/dag/test/claim/machine_intake/mtcollins1_ui_bundle_observe_witness_test.dag b/dag/test/claim/machine_intake/mtcollins1_ui_bundle_observe_witness_test.dag
index 204388c610c..5c5f982713a 100644
--- a/dag/test/claim/machine_intake/mtcollins1_ui_bundle_observe_witness_test.dag
+++ b/dag/test/claim/machine_intake/mtcollins1_ui_bundle_observe_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.machine_intake.mtcollins1_ui_bundle_observe_witness_test
 
 import std.types { Bool, List, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import gunbc.machine_intake_megarac_served_ui_catalog_observation { megarac_source_min_js_sha256_2026_09_27 }
 import gunbc.machine_intake_mtcollins1_ui_bundle_observe {
diff --git a/dag/test/claim/machine_intake/no_fallback_plan_ineligibility_wall_test.dag b/dag/test/claim/machine_intake/no_fallback_plan_ineligibility_wall_test.dag
index 0f3de050d12..fa8aeb2af7c 100644
--- a/dag/test/claim/machine_intake/no_fallback_plan_ineligibility_wall_test.dag
+++ b/dag/test/claim/machine_intake/no_fallback_plan_ineligibility_wall_test.dag
@@ -12,7 +12,7 @@ import gunbc.compile_diagnostic_census {
   census_count_at_key,
   censuses_differ_by_exactly_the_target_key
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // THE WALL IS REAL, PROVEN WHERE ITS RED IS AUTHORABLE (DESIGN §4b).
 // NO-FALLBACK-0's claim is that a plan cannot carry a spare available
diff --git a/dag/test/claim/machine_intake/smpro_internal_error_witness_test.dag b/dag/test/claim/machine_intake/smpro_internal_error_witness_test.dag
index 675ed3299dd..67479d06127 100644
--- a/dag/test/claim/machine_intake/smpro_internal_error_witness_test.dag
+++ b/dag/test/claim/machine_intake/smpro_internal_error_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.machine_intake.smpro_internal_error_witness_test
 import v2.std.algebra { any }
 import std.types { Bool, Int, List, NonEmptyStr, String }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.ampere.smpro_internal_error {
   SmproInternalRecord, SmproNamedCode, SmproCodeDefined, SmproCodeUndefined,
   SmproRecordKind, SmproErrorWithData, SmproErrorWithoutData, SmproWarning, SmproEnter, SmproExit,
diff --git a/dag/test/claim/materialization_kernel_closing_frontier_audit_witness_test.dag b/dag/test/claim/materialization_kernel_closing_frontier_audit_witness_test.dag
index d486b6542de..6247fc4d55f 100644
--- a/dag/test/claim/materialization_kernel_closing_frontier_audit_witness_test.dag
+++ b/dag/test/claim/materialization_kernel_closing_frontier_audit_witness_test.dag
@@ -1,6 +1,6 @@
 module test.claim.materialization_kernel_closing_frontier_audit_witness
 
-import v2.std.optional { optional_absent, optional_present }
+import std.optional { optional_absent, optional_present }
 import gunbc.materialization_kernel_closing_frontier_audit {
   ClauseVerdict,
   FrontierClause,
diff --git a/dag/test/claim/namecheap_workflow_witness_test.dag b/dag/test/claim/namecheap_workflow_witness_test.dag
index b0a36189f93..9a762635c29 100644
--- a/dag/test/claim/namecheap_workflow_witness_test.dag
+++ b/dag/test/claim/namecheap_workflow_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.namecheap_workflow_witness_test
 
 import std.types { Bool, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.github.actions { Step, RunStep, UsesStep }
 import extdeps.languages.yaml.types { YamlString }
 import gunbc.fleet_converge_workflow {
diff --git a/dag/test/claim/native_frontier_ratchet_witness_test.dag b/dag/test/claim/native_frontier_ratchet_witness_test.dag
index 448e4028479..51516c2dde9 100644
--- a/dag/test/claim/native_frontier_ratchet_witness_test.dag
+++ b/dag/test/claim/native_frontier_ratchet_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.native_frontier_ratchet_witness_test
 
 import v2.std.algebra { any, is_empty, length }
-import v2.std.optional { Present, Absent, optional_absent }
+import std.optional { Present, Absent, optional_absent }
 import std.types { NonEmptyStr, List }
 import extdeps.bazel.label { PackagePath }
 import extdeps.bazel.target_pattern { SubtreeTargets, TargetPattern }
diff --git a/dag/test/claim/native_route_progress_guard_witness_test.dag b/dag/test/claim/native_route_progress_guard_witness_test.dag
index 195da954a3d..a81c23fcc96 100644
--- a/dag/test/claim/native_route_progress_guard_witness_test.dag
+++ b/dag/test/claim/native_route_progress_guard_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.native_route_progress_guard_witness_test
 
 import std.types { List }
 import v2.std.algebra { any, count_where, is_empty, length }
-import v2.std.optional { Present, Absent, optional_present, optional_absent }
+import std.optional { Present, Absent, optional_present, optional_absent }
 import std.content_hash { structural_content_hash }
 import v2.compiler.native_test_vocabulary {
   NativeTestStagePrepare, NativeTestStageContext, NativeTestStageEntry, NativeTestStageEval
diff --git a/dag/test/claim/native_scm_interaction_contract_witness_test.dag b/dag/test/claim/native_scm_interaction_contract_witness_test.dag
index f74ace7350a..a20729bbb88 100644
--- a/dag/test/claim/native_scm_interaction_contract_witness_test.dag
+++ b/dag/test/claim/native_scm_interaction_contract_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.native_scm_interaction_contract_witness
 
 import std.types { Bool, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import gunbc.native_scm_interaction_contract {
   NativeScmReceipt,
diff --git a/dag/test/claim/native_scm_interaction_scenario_fixture.dag b/dag/test/claim/native_scm_interaction_scenario_fixture.dag
index 8929657ceee..6d200d6e60c 100644
--- a/dag/test/claim/native_scm_interaction_scenario_fixture.dag
+++ b/dag/test/claim/native_scm_interaction_scenario_fixture.dag
@@ -1,7 +1,7 @@
 module test.claim.native_scm_interaction_scenario_fixture
 
 import std.types { Int, List, String }
-import v2.std.optional { Optional, Present, optional_present }
+import std.optional { Optional, Present, optional_present }
 import gunbc.native_scm_interaction_contract {
   NativeScmProposalIdentity,
   NativeScmCommitTransition,
diff --git a/dag/test/claim/network_switch_catalog_witness_test.dag b/dag/test/claim/network_switch_catalog_witness_test.dag
index f2ff0823c6a..e736364e30a 100644
--- a/dag/test/claim/network_switch_catalog_witness_test.dag
+++ b/dag/test/claim/network_switch_catalog_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.network_switch_catalog_witness
 
 import std.types { Bool, Int, List, String }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import std.measure {
   Bandwidth, bandwidth, bandwidth_count,
   byte_size_count, cpu_core_count_value,
diff --git a/dag/test/claim/ny_colo_census_rows_witness_test.dag b/dag/test/claim/ny_colo_census_rows_witness_test.dag
index 4aa961bf2d0..f2dec9cfa3a 100644
--- a/dag/test/claim/ny_colo_census_rows_witness_test.dag
+++ b/dag/test/claim/ny_colo_census_rows_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.ny_colo_census_rows_witness
 
 import std.types { Bool, NonEmptyStr }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import test.claim.colo_cabinet_density_witness {
   grain_offers_single_cabinet,
   rate_is_published,
diff --git a/dag/test/claim/opaque_census_declaration_scan_witness_test.dag b/dag/test/claim/opaque_census_declaration_scan_witness_test.dag
index 86fe2a11ba7..54735128dad 100644
--- a/dag/test/claim/opaque_census_declaration_scan_witness_test.dag
+++ b/dag/test/claim/opaque_census_declaration_scan_witness_test.dag
@@ -13,7 +13,7 @@ import extdeps.filesystem.filesystem_io {
   FilesystemFileObservationsDisagree, FilesystemFileSubjectRefused,
   filesystem_listing_observation, filesystem_file_observation, filesystem_read_outcome,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data live_tree_disposition: v2.std.live_tree.LiveTreeDisposition = v2.std.live_tree.SubstrateInputsOnly
 
diff --git a/dag/test/claim/operation_admit_callers_inert_witness_test.dag b/dag/test/claim/operation_admit_callers_inert_witness_test.dag
index b90799569e7..9235c4f15c9 100644
--- a/dag/test/claim/operation_admit_callers_inert_witness_test.dag
+++ b/dag/test/claim/operation_admit_callers_inert_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.operation_admit_callers_inert_witness
 
 import std.types { String, Bool, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class }
 
diff --git a/dag/test/claim/parse_test_fn_decl_return_clause_test.dag b/dag/test/claim/parse_test_fn_decl_return_clause_test.dag
index 34b2b3a6467..fad8326a214 100644
--- a/dag/test/claim/parse_test_fn_decl_return_clause_test.dag
+++ b/dag/test/claim/parse_test_fn_decl_return_clause_test.dag
@@ -24,7 +24,7 @@ import v2.std.diagnostic { Accepted, Diagnostic, NodeLocus, None, Rejected, Unav
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Conj, Node, Symbol, TypeNode, node_synthetic }
 import v2.std.node_query { binder_edge }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 
 // ---------------------------------------------------------------------------
 // THE ENROLLED REDS AND FALSIFIERS FOR THE POSITIONAL RETURN-TYPE READ.
diff --git a/dag/test/claim/pipeline_transport_emit_rest_shell_witness_test.dag b/dag/test/claim/pipeline_transport_emit_rest_shell_witness_test.dag
index 3fcbcda00f8..139a4330532 100644
--- a/dag/test/claim/pipeline_transport_emit_rest_shell_witness_test.dag
+++ b/dag/test/claim/pipeline_transport_emit_rest_shell_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.pipeline_transport_emit_rest_shell_witness
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.types { Bool, Int, String }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class }
 
diff --git a/dag/test/claim/planar_projection_witness_test.dag b/dag/test/claim/planar_projection_witness_test.dag
index 4e6a6f7f5fb..2f1283473c0 100644
--- a/dag/test/claim/planar_projection_witness_test.dag
+++ b/dag/test/claim/planar_projection_witness_test.dag
@@ -20,7 +20,7 @@ import std.planar_projection {
   axis_image_u, axis_image_v,
 }
 import std.checked_arithmetic { int_inclusive_max }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/dag/test/claim/quarantine_probe_disposition_witness_test.dag b/dag/test/claim/quarantine_probe_disposition_witness_test.dag
index e3b05b35341..011101ae728 100644
--- a/dag/test/claim/quarantine_probe_disposition_witness_test.dag
+++ b/dag/test/claim/quarantine_probe_disposition_witness_test.dag
@@ -33,7 +33,7 @@ import gunbc.quarantine_outside_gate_decline { QuarantineOutsideGateDecline, qua
 import extdeps.filesystem.filesystem_io { Filesystem }
 import v2.std.algebra { Cons, Empty, fold_list }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 import std.types { NonEmptyStr, List }
 
diff --git a/dag/test/claim/rack_mount_witness_test.dag b/dag/test/claim/rack_mount_witness_test.dag
index b4441a10c33..b6c85d914fc 100644
--- a/dag/test/claim/rack_mount_witness_test.dag
+++ b/dag/test/claim/rack_mount_witness_test.dag
@@ -11,7 +11,7 @@ import product.rack_mount {
 }
 import extdeps.rack.navepoint { navepoint_18u_open_frame_catalog }
 import extdeps.chassis.rosewill { rosewill_rsv_r4000u_catalog, rosewill_rsv_z2600u_catalog }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/dag/test/claim/rack_power_witness_test.dag b/dag/test/claim/rack_power_witness_test.dag
index b0ee96bafc0..32bb1fe2563 100644
--- a/dag/test/claim/rack_power_witness_test.dag
+++ b/dag/test/claim/rack_power_witness_test.dag
@@ -16,7 +16,7 @@ import product.rack_power {
 import extdeps.rack.navepoint { navepoint_18u_open_frame_catalog }
 import extdeps.chassis.rosewill { rosewill_rsv_r4000u_catalog }
 import extdeps.power.eaton_tripp_lite { eaton_tripp_lite_rs_1215_family_catalog }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/dag/test/claim/reference_binding_provenance_calibration_test.dag b/dag/test/claim/reference_binding_provenance_calibration_test.dag
index bd63a034a9c..6ca5f2f5ae8 100644
--- a/dag/test/claim/reference_binding_provenance_calibration_test.dag
+++ b/dag/test/claim/reference_binding_provenance_calibration_test.dag
@@ -52,7 +52,7 @@ import gunbc.tools.reference_binding_provenance_calibration {
   resolution_for_arm,
   observation_for,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.reference_binding_observation {
   RepeatedMentionDependencyObservation,
   SameFileNeighbourProductionRefused,
diff --git a/dag/test/claim/refinement_cast_wall_witness_test.dag b/dag/test/claim/refinement_cast_wall_witness_test.dag
index 57d2d39b044..43d9266a0b2 100644
--- a/dag/test/claim/refinement_cast_wall_witness_test.dag
+++ b/dag/test/claim/refinement_cast_wall_witness_test.dag
@@ -10,7 +10,7 @@ import gunbc.compile_diagnostic_census {
 import std.types { String, Bool, Int }
 import std.nat { Nat }
 import std.checked_arithmetic { checked_int_to_nat }
-import v2.std.optional { Present }
+import std.optional { Present }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
 
 data live_tree_disposition: LiveTreeDisposition = ReadsLiveTree
diff --git a/dag/test/claim/remote_jq_ssh_migration_witness_test.dag b/dag/test/claim/remote_jq_ssh_migration_witness_test.dag
index 68a1fb95dd7..a5185c8ba39 100644
--- a/dag/test/claim/remote_jq_ssh_migration_witness_test.dag
+++ b/dag/test/claim/remote_jq_ssh_migration_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.remote_jq_ssh_migration_witness
 import std.algebra { Empty }
 import std.types { Bool, NonEmptyStr, Secret, String }
 import v2.std.diagnostic { Accepted, Rejected }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import extdeps.ssh.password_session { PasswordSshSession }
 import extdeps.tools.jq {
   JqInvocation,
diff --git a/dag/test/claim/roadmap/roadmap_belt_publish_realization_wet_witness_test.dag b/dag/test/claim/roadmap/roadmap_belt_publish_realization_wet_witness_test.dag
index 0e9b24e5349..f2e37234739 100644
--- a/dag/test/claim/roadmap/roadmap_belt_publish_realization_wet_witness_test.dag
+++ b/dag/test/claim/roadmap/roadmap_belt_publish_realization_wet_witness_test.dag
@@ -14,7 +14,7 @@ module test.claim.roadmap.roadmap_belt_publish_realization_wet_witness_test
 
 import std.logic { Bool }
 import std.types { String, FilePath, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.shell
 import extdeps.filesystem.filesystem_io { Filesystem }
diff --git a/dag/test/claim/roadmap/roadmap_dispatch_actuator_witness_test.dag b/dag/test/claim/roadmap/roadmap_dispatch_actuator_witness_test.dag
index d59e463af9e..6aecd86be12 100644
--- a/dag/test/claim/roadmap/roadmap_dispatch_actuator_witness_test.dag
+++ b/dag/test/claim/roadmap/roadmap_dispatch_actuator_witness_test.dag
@@ -5,7 +5,7 @@ import gunbc.roadmap_sizing {
 }
 import test.claim.roadmap.roadmap_node_fixture { fx_authored, fx_authored_wi, fx_derivable_wi, fx_ticket_row, fx_ticket_wi, fx_superseded, fx_signed, fx_sign }
 
-import v2.std.optional { Present }
+import std.optional { Present }
 import std.types { NonEmptyStr, GitRef, FilePath, path_segment_is_safe }
 import std.disposition { Scaffold, Terminal }
 import gunbc.roadmap_model {
diff --git a/dag/test/claim/runner/runner_attempt_launch_witness_test.dag b/dag/test/claim/runner/runner_attempt_launch_witness_test.dag
index 2b513f6758f..962d432e01d 100644
--- a/dag/test/claim/runner/runner_attempt_launch_witness_test.dag
+++ b/dag/test/claim/runner/runner_attempt_launch_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.runner_attempt_launch_witness
 import gunbc.runner_attempt_launch { GitHubLaunchPayload, launch_payload_device }
 
 import std.types { String, Bool, Int, List, NonEmptyStr }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.measure { byte_size, byte_size_count }
 import std.nat { Nat }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
diff --git a/dag/test/claim/runner/runner_browser_toolchain_witness_test.dag b/dag/test/claim/runner/runner_browser_toolchain_witness_test.dag
index 01190fe54f6..fa319c20219 100644
--- a/dag/test/claim/runner/runner_browser_toolchain_witness_test.dag
+++ b/dag/test/claim/runner/runner_browser_toolchain_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.runner.runner_browser_toolchain_witness
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, List, list_length }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.github.actions { SelfHosted }
 import gunbc.ci_runner_target { gunbc_ci_selected_runner_spec }
 import gunbc.runner_registration_labels { runner_registration_labels, RegistrationLabelsResolved, RegistrationLabelsRefused }
diff --git a/dag/test/claim/runner/runner_capacity_operator_access_witness_test.dag b/dag/test/claim/runner/runner_capacity_operator_access_witness_test.dag
index d5af8b60f31..e053f7c2161 100644
--- a/dag/test/claim/runner/runner_capacity_operator_access_witness_test.dag
+++ b/dag/test/claim/runner/runner_capacity_operator_access_witness_test.dag
@@ -24,7 +24,7 @@ import gunbc.runner_capacity_operator_access {
   PrivOpSystemdDaemonReload,
   PrivOpSystemdUnitStart,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/dag/test/claim/runner/runner_microvm_guest_bring_up_witness_test.dag b/dag/test/claim/runner/runner_microvm_guest_bring_up_witness_test.dag
index a8393e67897..748f42ee94c 100644
--- a/dag/test/claim/runner/runner_microvm_guest_bring_up_witness_test.dag
+++ b/dag/test/claim/runner/runner_microvm_guest_bring_up_witness_test.dag
@@ -4,7 +4,7 @@ import gunbc.runner_microvm_cell_readiness { GitHubRunnerWorkload }
 
 import std.types { String, NonEmptyStr, Bool, Int, List }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.build_cache_instance { RunnerSlotIdentity }
 import gunbc.fleet_host_identity { operator_host_srv2 }
 import gunbc.runner_microvm { gunbc_runner_guest_image }
diff --git a/dag/test/claim/runner/runner_microvm_shakedown_workflow_witness_test.dag b/dag/test/claim/runner/runner_microvm_shakedown_workflow_witness_test.dag
index 84683bb1a37..2901a28ab83 100644
--- a/dag/test/claim/runner/runner_microvm_shakedown_workflow_witness_test.dag
+++ b/dag/test/claim/runner/runner_microvm_shakedown_workflow_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.runner.runner_microvm_shakedown_workflow_witness_test
 
 import std.types { Bool, String }
 import extdeps.github.actions { self_hosted_provenance_label, SelfHosted, RunStep }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.languages.yaml.types { YamlValue, YamlString }
 import gunbc.runner_microvm_shakedown_workflow {
   microvm_shakedown_job, microvm_shakedown_known_task_step, microvm_shakedown_attempt_expression,
diff --git a/dag/test/claim/runner/runner_microvm_slot_controller_witness_test.dag b/dag/test/claim/runner/runner_microvm_slot_controller_witness_test.dag
index 6d7fc92e04b..987150c31c3 100644
--- a/dag/test/claim/runner/runner_microvm_slot_controller_witness_test.dag
+++ b/dag/test/claim/runner/runner_microvm_slot_controller_witness_test.dag
@@ -8,7 +8,7 @@ import gunbc.runner_microvm_attempt_bounds {
   runner_attempt_vmm_deadline, runner_attempt_vmm_kill_grace, attempt_stop_grace, attempt_force_stop_bound, attempt_unit_stop_slack,
 }
 import extdeps.systemd.unit_file { slice_memory_max, slice_memory_swap_max }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import extdeps.systemd.unit_file {
   SystemdUnitFile, ServiceUnitFile, SystemdServiceDirective, ExecStart, ServiceType, ExecMode,
   ServiceExitType, ServiceKillMode, ExitTypeMain, KillModeControlGroup, Installable, WantedBy, Description,
diff --git a/dag/test/claim/runner/workspace_owner_access_witness_test.dag b/dag/test/claim/runner/workspace_owner_access_witness_test.dag
index 96749abf8fc..e60e6aa0035 100644
--- a/dag/test/claim/runner/workspace_owner_access_witness_test.dag
+++ b/dag/test/claim/runner/workspace_owner_access_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.runner.workspace_owner_access_witness_test
 
 import std.types { Bool, NonEmptyStr, List }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import extdeps.ssh { SshPublicKey, Ed25519, Rsa, ssh_public_key_line }
 import gunbc.fleet_ssh_access { operator_ssh_principal }
 import gunbc.principal_projection { PrincipalRef }
diff --git a/dag/test/claim/scm/scm_write_spine_witness_test.dag b/dag/test/claim/scm/scm_write_spine_witness_test.dag
index 15b2e41f36f..fa31ffece40 100644
--- a/dag/test/claim/scm/scm_write_spine_witness_test.dag
+++ b/dag/test/claim/scm/scm_write_spine_witness_test.dag
@@ -19,7 +19,7 @@ import std.types { Bool, String, List, Int, NonEmptyStr }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import gunbc.scm.ancestry { RepositoryCommitRef, repository_commit_ref_eq }
 import gunbc.scm.object_store {
-  CorpusManifestEntry, CorpusManifestObjectRef, ObjectId, object_id_eq,
+  CorpusManifestEntry, CorpusManifestObjectRef, ObjectId, object_id_eq, empty_store,
 }
 import gunbc.scm.integration { NoSquashIntegration }
 import gunbc.scm.repository_envelope { RepositoryEnvelope, commit_at_reference, empty_repository }
diff --git a/dag/test/claim/scm_repository_save_real_execution_witness_test.dag b/dag/test/claim/scm_repository_save_real_execution_witness_test.dag
index d3c95e09d5b..003f29ca10f 100644
--- a/dag/test/claim/scm_repository_save_real_execution_witness_test.dag
+++ b/dag/test/claim/scm_repository_save_real_execution_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.scm_repository_save_real_execution_witness
 
 import std.types { Bool, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.languages.json.emit { serialize_json }
diff --git a/dag/test/claim/scoped_authorization_claim_state_witness_test.dag b/dag/test/claim/scoped_authorization_claim_state_witness_test.dag
index dc7e9d16dc2..b78cce47d4c 100644
--- a/dag/test/claim/scoped_authorization_claim_state_witness_test.dag
+++ b/dag/test/claim/scoped_authorization_claim_state_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.scoped_authorization_claim_state
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.scoped_authorization {
   AuthorizationClaimState, Unclaimed, ClaimedBy, CompletedBy, AbortedBy, AttemptIdentity,
   serialize_authorization_claim_state, parse_authorization_claim_state,
diff --git a/dag/test/claim/scoped_authorization_scope_wire_witness_test.dag b/dag/test/claim/scoped_authorization_scope_wire_witness_test.dag
index 6eb5fa6633e..744c6d9255b 100644
--- a/dag/test/claim/scoped_authorization_scope_wire_witness_test.dag
+++ b/dag/test/claim/scoped_authorization_scope_wire_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.scoped_authorization_scope_wire
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.effect_grant { Read, Write, Execute, NamespacePosition, CodeNameTree, FilesystemPathTree, ServiceOpTree }
 import std.scoped_authorization {
diff --git a/dag/test/claim/self_host_generation_identity_witness_test.dag b/dag/test/claim/self_host_generation_identity_witness_test.dag
index f6edd2c79f8..a4ad1eaf447 100644
--- a/dag/test/claim/self_host_generation_identity_witness_test.dag
+++ b/dag/test/claim/self_host_generation_identity_witness_test.dag
@@ -32,7 +32,7 @@ import v2.compiler.self_host.generation {
 }
 import v2.std.algebra { fold_list, for_all, length }
 import v2.std.node { Hash, symbol_identity_digest }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.content_hash { sha512_hex_digest }
 
 data gi_artifact_baseline_hex: String = "8f31919534d1585a005d999df89eea61ae2aee36ed7f943b768f251bc38c7cbdd927d3dd88c1a1b9322552ee85bf2f866acfc2e9e9d718a6b4195e86b0943316"
diff --git a/dag/test/claim/self_host_promotion_admission_witness_test.dag b/dag/test/claim/self_host_promotion_admission_witness_test.dag
index bd06318acf7..2614b8fd827 100644
--- a/dag/test/claim/self_host_promotion_admission_witness_test.dag
+++ b/dag/test/claim/self_host_promotion_admission_witness_test.dag
@@ -60,7 +60,7 @@ import v2.std.diagnostic { outcome_accepted }
 import v2.std.node { Atom, Node, TypeNode }
 import v2.std.witness { Holds }
 import v2.std.node { Hash, combine_hash, symbol_identity_digest }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.content_hash { content_hash_atom, sha512_hex_digest }
 import std.types { NonEmptyStr, List }
 
diff --git a/dag/test/claim/serving/engine_progress_witness_test.dag b/dag/test/claim/serving/engine_progress_witness_test.dag
index 8f87d176538..b26d14265c9 100644
--- a/dag/test/claim/serving/engine_progress_witness_test.dag
+++ b/dag/test/claim/serving/engine_progress_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.serving.engine_progress_witness
 import std.types { Bool, String, NonEmptyStr, EpochSecs }
 import std.nat { Nat }
 import std.measure { second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.fabric.demand { ObservationReceiptRef }
 import gunbc.spark.fabric_switch_observed { FabricGroupA }
 import gunbc.serving.serving_enrollment { ServingRouteEndpoint }
diff --git a/dag/test/claim/serving/serving_front_door_witness_test.dag b/dag/test/claim/serving/serving_front_door_witness_test.dag
index e0310e8f19a..575ec452b87 100644
--- a/dag/test/claim/serving/serving_front_door_witness_test.dag
+++ b/dag/test/claim/serving/serving_front_door_witness_test.dag
@@ -1,6 +1,6 @@
 module test.claim.serving.serving_front_door_witness_test
 
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { NonEmptyStr, String, Bool, List, EpochSecs, Secret }
 import std.nat { Nat }
diff --git a/dag/test/claim/serving/turn_admission_witness_test.dag b/dag/test/claim/serving/turn_admission_witness_test.dag
index ba30081f064..ac4b94ae62d 100644
--- a/dag/test/claim/serving/turn_admission_witness_test.dag
+++ b/dag/test/claim/serving/turn_admission_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.serving.turn_admission_witness
 
 import std.types { Bool, String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.fabric.demand { ObservationReceiptRef }
 import product.fabric.selection { AvailableIndefinitely, NoTransitionRequired, NoFeasibleAlternativeUse }
 import gunbc.spark.fabric_switch_observed { FabricGroupA, FabricGroupB }
diff --git a/dag/test/claim/serving/turn_demand_witness_test.dag b/dag/test/claim/serving/turn_demand_witness_test.dag
index 5aff58307bf..2d93dd5f7be 100644
--- a/dag/test/claim/serving/turn_demand_witness_test.dag
+++ b/dag/test/claim/serving/turn_demand_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.serving.turn_demand_witness
 
 import std.types { Bool, String, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.fabric.work {
   ArtifactManifestRef, EffectContractRef, OutputContractRef, ExecutionRequirements, ServiceInterfaceRef,
   ControlPlaneCapacity, Shape, HardRequirements, CapabilityManifestRef, TrustDomainRef, OpaqueEffects,
diff --git a/dag/test/claim/shell/bmc_netboot_typed_staging_witness_test.dag b/dag/test/claim/shell/bmc_netboot_typed_staging_witness_test.dag
index d6b6164a2b0..b6d07007718 100644
--- a/dag/test/claim/shell/bmc_netboot_typed_staging_witness_test.dag
+++ b/dag/test/claim/shell/bmc_netboot_typed_staging_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.shell.bmc_netboot_typed_staging_witness_test
 
 import std.types { Bool, String, Int, List, NonEmptyStr, list_length }
 import std.algebra { list_append }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class }
 import gunbc.bmc_netboot_serve {
diff --git a/dag/test/claim/shell/shell_typed_invocation_witness_test.dag b/dag/test/claim/shell/shell_typed_invocation_witness_test.dag
index c9b390c367a..d5ab7ccf8f8 100644
--- a/dag/test/claim/shell/shell_typed_invocation_witness_test.dag
+++ b/dag/test/claim/shell/shell_typed_invocation_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.shell.shell_typed_invocation_witness_test
 
 import std.types { Bool, String, List, Int, NonEmptyStr, list_length }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.compile_diagnostic_census { CompileDiagnosticCensus }
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class }
 import extdeps.linux.usb_gadget {
diff --git a/dag/test/claim/sole_constructor_type_head_exposure_witness_test.dag b/dag/test/claim/sole_constructor_type_head_exposure_witness_test.dag
index b85b9aeaefe..75eea991787 100644
--- a/dag/test/claim/sole_constructor_type_head_exposure_witness_test.dag
+++ b/dag/test/claim/sole_constructor_type_head_exposure_witness_test.dag
@@ -10,7 +10,7 @@ import gunbc.compile_diagnostic_census {
 import gunbc.guarantee_probe_corpus { census_blocking_count_for_class }
 import std.types { Bool, Int, String }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // THE DISCRIMINATING PAIR IS THE WHOLE ARGUMENT, so the six sources below differ on exactly one
 // axis at a time and on nothing else. sc_sealed_at_payload_red and sc_plain_at_payload_red are
diff --git a/dag/test/claim/source_reference_repoint_witness_test.dag b/dag/test/claim/source_reference_repoint_witness_test.dag
new file mode 100644
index 00000000000..d7b09752660
--- /dev/null
+++ b/dag/test/claim/source_reference_repoint_witness_test.dag
@@ -0,0 +1,73 @@
+module test.claim.source_reference_repoint_witness_test
+
+import std.types { Bool, Int, List, String }
+import gunbc.parsed_import_statement_production { parsed_import_observation_live }
+import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
+import tools.source_reference_repoint {
+  SourceEdit, ReferenceRepoint,
+  apply_source_edits, module_path_repoint_edits, repointed_source_text
+}
+
+data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
+
+// CLAIMS OVER THE REWRITE AT ITS OWN INTERFACE: source text in, source text out. The inputs are
+// supplied strings; the real path (every file under the roots) is the repoint entry itself, whose
+// output is the tree this file is committed with.
+
+fn optional_move() -> ReferenceRepoint {
+  ReferenceRepoint { from_path: "v2.std.optional", to_path: "std.optional" }
+}
+
+fn rewritten(text: String) -> String {
+  repointed_source_text(path: "probe.dag", text: text, repoints: [optional_move()])
+}
+
+test fn an_import_path_is_repointed() -> Bool {
+  rewritten(text: "module p.m\nimport v2.std.optional \{ Present, Absent \}\n")
+    == "module p.m\nimport std.optional \{ Present, Absent \}\n"
+}
+
+test fn a_qualified_name_keeps_its_remainder() -> Bool {
+  rewritten(text: "module p.m\nfn f(o: v2.std.optional.Optional<Int>) -> Int \{ 0 \}\n")
+    == "module p.m\nfn f(o: std.optional.Optional<Int>) -> Int \{ 0 \}\n"
+}
+
+test fn a_declaration_ref_row_is_repointed() -> Bool {
+  rewritten(text: "module p.m\ndata r: DeclarationRef = decl_ref(module_path: \"v2.std.optional\", decl_name: \"Optional\")\n")
+    == "module p.m\ndata r: DeclarationRef = decl_ref(module_path: \"std.optional\", decl_name: \"Optional\")\n"
+}
+
+// A path inside a string that is not a module_path argument is source TEXT, not a reference, and a
+// comment is not a token at all. Both survive; the import beside them does not.
+test fn a_string_and_a_comment_are_not_references() -> Bool {
+  rewritten(text: "module p.m\n// see v2.std.optional\nimport v2.std.optional \{ Present \}\ndata s: String = \"import v2.std.optional\"\n")
+    == "module p.m\n// see v2.std.optional\nimport std.optional \{ Present \}\ndata s: String = \"import v2.std.optional\"\n"
+}
+
+// Whole segments decide: a sibling module whose last segment only starts with the moved one, and a
+// module the moved path is a suffix of, are different modules.
+test fn a_neighbouring_module_path_is_left_alone() -> Bool {
+  let text = "module p.m\nimport v2.std.optional_extra \{ A \}\nimport x.v2.std.optional \{ B \}\n"
+  rewritten(text: text) == text
+}
+
+// The unit is the code point. A non-ASCII character ahead of the edit is more than one byte, so an
+// applier slicing by byte would cut the wrong span here.
+test fn a_non_ascii_prefix_does_not_shift_the_edit() -> Bool {
+  rewritten(text: "module p.m\ndata d: String = \"é—✓\"\nimport v2.std.optional \{ Present \}\n")
+    == "module p.m\ndata d: String = \"é—✓\"\nimport std.optional \{ Present \}\n"
+}
+
+// Idempotence, stated as the thing that makes a rebase a re-run: the rewritten text yields no edit.
+test fn a_second_run_produces_no_edit() -> Bool {
+  let once = rewritten(text: "module p.m\nimport v2.std.optional \{ Present \}\nfn f(o: v2.std.optional.Optional<Int>) -> Int \{ 0 \}\n")
+  count(module_path_repoint_edits(tokens: parsed_import_observation_live(file: "probe.dag", source: once).tokens, repoint: optional_move())) == 0
+    && rewritten(text: once) == once
+}
+
+test fn edits_are_applied_in_position_order() -> Bool {
+  apply_source_edits(text: "abcdef", edits: [
+    SourceEdit { start: 4, end: 5, replacement: "X" },
+    SourceEdit { start: 1, end: 2, replacement: "YY" }
+  ]) == "aYYcdXf"
+}
diff --git a/dag/test/claim/spark/arm_memory_fit_envelope_witness_test.dag b/dag/test/claim/spark/arm_memory_fit_envelope_witness_test.dag
index efea5df2a89..93592d04c15 100644
--- a/dag/test/claim/spark/arm_memory_fit_envelope_witness_test.dag
+++ b/dag/test/claim/spark/arm_memory_fit_envelope_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.arm_memory_fit_envelope_witness_test
 import std.types { Bool, NonEmptyStr, List, String }
 import std.nat { Nat }
 import std.measure { token_count, basis_point }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.engine_args {
   PrefixCachingExplicit, KvFp8, EngramConfigOmitted, ModalityOmitted,
   VllmSchedulerAdmissionRequest, FullInputAdmissionExplicit, KvWatermarkExplicit, vllm_scheduler_admission_omitted, IndexerKvDtypeOmitted,
diff --git a/dag/test/claim/spark/arm_memory_fit_witness_test.dag b/dag/test/claim/spark/arm_memory_fit_witness_test.dag
index 8ee46f15348..9364a778fb3 100644
--- a/dag/test/claim/spark/arm_memory_fit_witness_test.dag
+++ b/dag/test/claim/spark/arm_memory_fit_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.arm_memory_fit_witness
 
 import std.types { Bool, NonEmptyStr, List }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure {
   ByteSize, byte_size, byte_size_count, measure_le,
   gibibyte, gibibyte_to_byte_size, gibibyte_scale_factor_bytes, basis_point,
diff --git a/dag/test/claim/spark/arm_memory_plan_cache_fold_witness_test.dag b/dag/test/claim/spark/arm_memory_plan_cache_fold_witness_test.dag
index 64e83142418..2ace7da0596 100644
--- a/dag/test/claim/spark/arm_memory_plan_cache_fold_witness_test.dag
+++ b/dag/test/claim/spark/arm_memory_plan_cache_fold_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.arm_memory_plan_cache_fold_witness
 
 import std.types { Bool, String, NonEmptyStr }
 import std.nat { Nat, nat_range_inclusive }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure {
   TokenCount, token_count, token_count_value,
   AllocatorBlockCount, allocator_block_count, allocator_block_count_value,
diff --git a/dag/test/claim/spark/awaited_incarnation_witness_test.dag b/dag/test/claim/spark/awaited_incarnation_witness_test.dag
index 352acf84f8d..09274ab22b2 100644
--- a/dag/test/claim/spark/awaited_incarnation_witness_test.dag
+++ b/dag/test/claim/spark/awaited_incarnation_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.awaited_incarnation_witness_test
 
 import std.types { Bool, String, List, NonEmptyStr, Int, EpochSecs }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import gunbc.spark.awaited_incarnation {
   AwaitedIncarnation, AwaitedVerdict, AwaitedObserved, AwaitedRefused, AwaitedLegOutlivedBound,
diff --git a/dag/test/claim/spark/captured_stair_inspect_witness_test.dag b/dag/test/claim/spark/captured_stair_inspect_witness_test.dag
index 829a7c83fd0..aa108bc4285 100644
--- a/dag/test/claim/spark/captured_stair_inspect_witness_test.dag
+++ b/dag/test/claim/spark/captured_stair_inspect_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.captured_stair_inspect_witness_test
 
 import std.types { Bool, String, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.docker.container_inspect { ContainerInspect, ContainerInspectRead, ContainerInspectDecoded, ContainerInspectUnreadable, container_inspect_from_stdout }
 import gunbc.spark.serving_relaunch_transaction { observed_env_assignments }
 import gunbc.spark.native_serving_apply { spark_native_unplanned_assignments }
diff --git a/dag/test/claim/spark/deliberate_unit_start_witness_test.dag b/dag/test/claim/spark/deliberate_unit_start_witness_test.dag
index f031ab10bcc..01f27350af7 100644
--- a/dag/test/claim/spark/deliberate_unit_start_witness_test.dag
+++ b/dag/test/claim/spark/deliberate_unit_start_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.deliberate_unit_start_witness_test
 
 import std.types { Bool, String, List, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.host_effect_quiescence { ArgvRun, ArgvRan, ArgvLegDidNotRun }
 import gunbc.spark.deliberate_unit_start { deliberate_unit_start_leg }
 import gunbc.spark.host_occupancy_admission { restore_spark_serving_units }
diff --git a/dag/test/claim/spark/execution_cell_witness_test.dag b/dag/test/claim/spark/execution_cell_witness_test.dag
index afbd663e267..51884c749b6 100644
--- a/dag/test/claim/spark/execution_cell_witness_test.dag
+++ b/dag/test/claim/spark/execution_cell_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, String, NonEmptyStr, List }
 import gunbc.spark.glm_group_b_launch { glm_group_b_deployment_env }
 import std.nat { Nat }
 import std.measure { token_count, token_count_value , second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import gunbc.spark.execution_cell {
   ExecutionCellPhase, CellPhaseInventory, CellPhaseQuiescence, CellPhaseDisposal, CellPhaseSettlement,
diff --git a/dag/test/claim/spark/fabric_blob_peer_witness_test.dag b/dag/test/claim/spark/fabric_blob_peer_witness_test.dag
index 972d9cde018..9574c6a52b0 100644
--- a/dag/test/claim/spark/fabric_blob_peer_witness_test.dag
+++ b/dag/test/claim/spark/fabric_blob_peer_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.fabric_blob_peer_witness
 
 import std.types { Bool, List, NonEmptyStr, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import extdeps.tools.rsync { rsyncd_conf_text, rsync_daemon_foreground_argv, rsync_exit_status_is_unreachable }
 import extdeps.tools.curl { curl_exit_status_is_unreachable }
diff --git a/dag/test/claim/spark/fabric_capacity_standing_witness_test.dag b/dag/test/claim/spark/fabric_capacity_standing_witness_test.dag
index a05e92b4179..950c1875b71 100644
--- a/dag/test/claim/spark/fabric_capacity_standing_witness_test.dag
+++ b/dag/test/claim/spark/fabric_capacity_standing_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.fabric_capacity_standing_witness
 
 import std.types { Bool, String, NonEmptyStr, List, EpochSecs }
 import std.process { ProcessExit, ExitSuccess, ExitFailure }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.fabric_switch_observed { fabric_group_hosts }
 import std.content_hash { ContentHash, Sha256Hash, Sha256Digest, Sha256DigestHex }
 import std.measure { concurrent_request_hundredths_count, token_count }
diff --git a/dag/test/claim/spark/fp4_checkpoint_extension_witness_test.dag b/dag/test/claim/spark/fp4_checkpoint_extension_witness_test.dag
index a7fa9f59aab..3f5ab9793ec 100644
--- a/dag/test/claim/spark/fp4_checkpoint_extension_witness_test.dag
+++ b/dag/test/claim/spark/fp4_checkpoint_extension_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.fp4_checkpoint_extension_witness_test
 import std.types { Bool, String, NonEmptyStr }
 import std.nat { Nat }
 import std.measure { token_count, basis_point, gibibyte_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { length }
 import extdeps.vllm.engine_args { PrefixCachingExplicit, VllmKvCacheDtypeRequest, KvNvfp4, IndexerKvDtypeOmitted }
 import extdeps.vllm.source_build { vllm_8d09804_sm121_recipe }
diff --git a/dag/test/claim/spark/glm53_runtime_image_build_witness_test.dag b/dag/test/claim/spark/glm53_runtime_image_build_witness_test.dag
index 4696acafb49..f6df3733692 100644
--- a/dag/test/claim/spark/glm53_runtime_image_build_witness_test.dag
+++ b/dag/test/claim/spark/glm53_runtime_image_build_witness_test.dag
@@ -12,7 +12,7 @@ import gunbc.spark.vllm_image_identity {
 import gunbc.remote_operation { remote_operation_count, remote_operation_file_write_count, remote_operation_argv }
 import gunbc.spark.native_serving_realization { glm_native_ranked_hosts }
 import product.host_identity { host_identity_eq, HostIdentity }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.group_image_produce { distribution_source_candidates }
 import gunbc.spark.glm53_kvplan_image { glm53_kvplan_produced_image_held }
 import extdeps.docker.cli { docker_image_save_command, docker_image_load_command }
diff --git a/dag/test/claim/spark/glm_group_b_launch_authority_witness_test.dag b/dag/test/claim/spark/glm_group_b_launch_authority_witness_test.dag
index ae0b4bfe2ad..64199cdcd15 100644
--- a/dag/test/claim/spark/glm_group_b_launch_authority_witness_test.dag
+++ b/dag/test/claim/spark/glm_group_b_launch_authority_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.glm_group_b_launch_authority_witness_test
 
 import std.types { Bool, String, NonEmptyStr, List }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { skip, zip_map }
 import extdeps.docker.cli {
   DockerCreateSpec, DockerForegroundRunArgv, DockerForegroundRunRefused,
diff --git a/dag/test/claim/spark/group_arm_launch_witness_test.dag b/dag/test/claim/spark/group_arm_launch_witness_test.dag
index e1613f5c3d9..5c1f469abd0 100644
--- a/dag/test/claim/spark/group_arm_launch_witness_test.dag
+++ b/dag/test/claim/spark/group_arm_launch_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.group_arm_launch_witness
 
 import std.types { Bool, String, List, NonEmptyStr }
 import std.content_hash { ContentHash, content_hash_equal }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { token_count, kibibyte, mebibyte, basis_point, second_count }
 import extdeps.systemd { Active }
 import extdeps.vllm.engine_args { FullInputAdmissionExplicit, FullInputAdmissionOmitted, KvWatermarkExplicit, KvWatermarkOmitted, VllmSchedulerAdmissionRequest }
diff --git a/dag/test/claim/spark/group_arm_serving_load_witness_test.dag b/dag/test/claim/spark/group_arm_serving_load_witness_test.dag
index 1bdc08d86bb..d1477e11f43 100644
--- a/dag/test/claim/spark/group_arm_serving_load_witness_test.dag
+++ b/dag/test/claim/spark/group_arm_serving_load_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.group_arm_serving_load_witness
 import std.types { Bool, String, List, NonEmptyStr }
 import std.nat { Nat }
 import std.measure { byte_size, microsecond }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import extdeps.linux.psi { PsiRead }
 import extdeps.linux.cgroup_v2_memory { CgroupMemoryStat }
diff --git a/dag/test/claim/spark/group_b_serving_capacity_witness_test.dag b/dag/test/claim/spark/group_b_serving_capacity_witness_test.dag
index 30c5f287d1d..a2b4e2ddf34 100644
--- a/dag/test/claim/spark/group_b_serving_capacity_witness_test.dag
+++ b/dag/test/claim/spark/group_b_serving_capacity_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.group_b_serving_capacity_witness_test
 
 import std.types { Bool }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.group_b_serving_capacity {
   group_b_restoration_intent_admission, group_b_restoration_intent, group_b_restoration_profile,
   group_b_restoration_utilization, group_b_restoration_seats, group_b_restoration_executable, group_b_experiment_subject_seats,
diff --git a/dag/test/claim/spark/host_occupancy_admission_witness_test.dag b/dag/test/claim/spark/host_occupancy_admission_witness_test.dag
index b07e58d56e0..c7cf9c55605 100644
--- a/dag/test/claim/spark/host_occupancy_admission_witness_test.dag
+++ b/dag/test/claim/spark/host_occupancy_admission_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.host_occupancy_admission_witness
 
 import std.types { Bool, Int, List, String, NonEmptyStr }
 import std.measure { Kibibyte, kibibyte, kibibyte_count, mebibyte_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import extdeps.nvidia.system_management_interface {
   NvidiaComputeAppsRead, ComputeAppsParsed, ComputeAppsUnparsed, parse_compute_apps,
diff --git a/dag/test/claim/spark/kv_roster_group_vocabulary_witness_test.dag b/dag/test/claim/spark/kv_roster_group_vocabulary_witness_test.dag
index 853a490d321..565107d0214 100644
--- a/dag/test/claim/spark/kv_roster_group_vocabulary_witness_test.dag
+++ b/dag/test/claim/spark/kv_roster_group_vocabulary_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.kv_roster_group_vocabulary_witness_test
 
 import std.types { Bool }
 import std.measure { token_count, token_count_value }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.kv_layout { FullAttention, SlidingWindowAttention, MambaState, KPoolIndex }
 import gunbc.spark.arm_memory_fit {
   ExpectMambaKind, ExpectFullAttentionKind, ExpectSlidingWindowKind, expected_group_kind_matches, kv_group_kpool_interval,
diff --git a/dag/test/claim/spark/launch_admission_runtime_witness_test.dag b/dag/test/claim/spark/launch_admission_runtime_witness_test.dag
index 7e68990b043..242cbee7cf3 100644
--- a/dag/test/claim/spark/launch_admission_runtime_witness_test.dag
+++ b/dag/test/claim/spark/launch_admission_runtime_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.launch_admission_runtime_witness_test
 
 import std.types { Bool, NonEmptyStr }
 import std.measure { token_count, basis_point }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.engine_args {
   PrefixCachingExplicit, KvFp8, EngramConfigOmitted, ModalityOmitted, IndexerKvDtypeOmitted,
   VllmSchedulerAdmissionRequest, FullInputAdmissionExplicit, KvWatermarkExplicit, vllm_scheduler_admission_omitted,
diff --git a/dag/test/claim/spark/native_experiment_apply_witness_test.dag b/dag/test/claim/spark/native_experiment_apply_witness_test.dag
index 45d74fbd20e..1dd6d830350 100644
--- a/dag/test/claim/spark/native_experiment_apply_witness_test.dag
+++ b/dag/test/claim/spark/native_experiment_apply_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.native_experiment_apply_witness_test
 import std.types { Bool, String, NonEmptyStr, List }
 import gunbc.spark.glm_group_b_launch { glm_group_b_deployment_env }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.native_experiment_apply {
   ArmExperimentActuationAdmission, ArmExperimentActuationAdmitted, ArmExperimentActuationRefused,
   arm_experiment_actuation_admission,
diff --git a/dag/test/claim/spark/native_serving_realization_witness_test.dag b/dag/test/claim/spark/native_serving_realization_witness_test.dag
index 10015104b9b..4fc622db77b 100644
--- a/dag/test/claim/spark/native_serving_realization_witness_test.dag
+++ b/dag/test/claim/spark/native_serving_realization_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.native_serving_realization_witness_test
 
 import std.types { Bool, String, List, NonEmptyStr }
 import std.measure { second, second_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.native_serving_realization {
   GlmNativeUnitRender, GlmNativeUnitRendered, GlmNativeUnitRenderRefused,
   glm_native_all_unit_renders, glm_native_experiment_all_unit_renders, glm_native_all_unit_renders_for,
diff --git a/dag/test/claim/spark/native_serving_roce_transport_witness_test.dag b/dag/test/claim/spark/native_serving_roce_transport_witness_test.dag
index 42435a00746..41f4f34409d 100644
--- a/dag/test/claim/spark/native_serving_roce_transport_witness_test.dag
+++ b/dag/test/claim/spark/native_serving_roce_transport_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.native_serving_roce_transport_witness_test
 
 import std.types { Bool, String, NonEmptyStr, List, FilePath, Int }
 import std.algebra { trim }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.fleet_host_identity { operator_host_srv9 }
 import gunbc.spark.fabric_switch_observed { FabricLaneObserved, fabric_lane_for_host }
 import gunbc.spark.fabric_rail_desired { fabric_rail_address_of }
diff --git a/dag/test/claim/spark/pair_incumbent_identity_witness_test.dag b/dag/test/claim/spark/pair_incumbent_identity_witness_test.dag
index 81fd235e031..46602a02a81 100644
--- a/dag/test/claim/spark/pair_incumbent_identity_witness_test.dag
+++ b/dag/test/claim/spark/pair_incumbent_identity_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.pair_incumbent_identity_witness
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash, Sha256Hash, sha256_hex_digest, compare_content_hash, ContentHashEqual, ContentHashDifferent, ContentHashCrossFamilyIncomparable }
 import product.host_identity { HostIdentity }
 import product.fabric.demand { ObservationReceiptRef }
diff --git a/dag/test/claim/spark/pair_serving_authority_log_real_execution_witness_test.dag b/dag/test/claim/spark/pair_serving_authority_log_real_execution_witness_test.dag
index 688fe00ee75..b15f519292e 100644
--- a/dag/test/claim/spark/pair_serving_authority_log_real_execution_witness_test.dag
+++ b/dag/test/claim/spark/pair_serving_authority_log_real_execution_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.pair_serving_authority_log_real_execution
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, FilePath, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.fabric_switch_observed { fabric_group_hosts }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.shell
diff --git a/dag/test/claim/spark/pair_serving_authority_log_witness_test.dag b/dag/test/claim/spark/pair_serving_authority_log_witness_test.dag
index d29d6cee298..ee5314749dd 100644
--- a/dag/test/claim/spark/pair_serving_authority_log_witness_test.dag
+++ b/dag/test/claim/spark/pair_serving_authority_log_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.pair_serving_authority_log_witness
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import gunbc.spark.fabric_switch_observed { fabric_group_hosts }
 import std.content_hash { ContentHash, Sha256Hash, sha256_hex_digest, compare_content_hash, ContentHashEqual, ContentHashDifferent, ContentHashCrossFamilyIncomparable, content_hash_equal }
diff --git a/dag/test/claim/spark/pair_serving_authority_witness_test.dag b/dag/test/claim/spark/pair_serving_authority_witness_test.dag
index 9354f94af8f..ae29af7d853 100644
--- a/dag/test/claim/spark/pair_serving_authority_witness_test.dag
+++ b/dag/test/claim/spark/pair_serving_authority_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.pair_serving_authority_witness
 
 import std.logic { Bool }
 import std.types { NonEmptyStr, List, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash, Sha256Hash, sha256_hex_digest }
 import std.temporal_effect { HeldLease, held_lease, LeaseEpoch, LeaseRunningExpected, LeaseRunningStale, LeaseAbsent, LeasePortForeign, LeaseInaccessible }
 import gunbc.spark.fabric_switch_observed { FabricGroupA, FabricGroupB, fabric_group_hosts, fabric_group_wire }
diff --git a/dag/test/claim/spark/pair_serving_capacity_floor_witness_test.dag b/dag/test/claim/spark/pair_serving_capacity_floor_witness_test.dag
index 3bbad70f5ff..102322ee6b0 100644
--- a/dag/test/claim/spark/pair_serving_capacity_floor_witness_test.dag
+++ b/dag/test/claim/spark/pair_serving_capacity_floor_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.pair_serving_capacity_floor_witness
 
 import std.types { Bool, String, Int, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat }
 import std.content_hash { ContentHash, Sha256Hash, Sha256Digest, Sha256DigestHex }
 import std.measure { TokenCount, token_count, concurrent_request_hundredths, AllocatorBlockCount, allocator_block_count, allocator_block_count_value, attention_layer_count, ByteSize, byte_size }
diff --git a/dag/test/claim/spark/pair_serving_d0_authorization_witness_test.dag b/dag/test/claim/spark/pair_serving_d0_authorization_witness_test.dag
index e44e73f09ce..16380e39aac 100644
--- a/dag/test/claim/spark/pair_serving_d0_authorization_witness_test.dag
+++ b/dag/test/claim/spark/pair_serving_d0_authorization_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.pair_serving_d0_authorization_witness
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, List, Timestamp }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.content_hash { ContentHash, Sha256Hash, sha256_hex_digest, serialize_content_hash }
 import std.scoped_authorization { AuthorizationRequest, AuthorizationGranted }
diff --git a/dag/test/claim/spark/pair_serving_d0_front_door_real_execution_witness_test.dag b/dag/test/claim/spark/pair_serving_d0_front_door_real_execution_witness_test.dag
index daa57adac8d..dc34c7a2e00 100644
--- a/dag/test/claim/spark/pair_serving_d0_front_door_real_execution_witness_test.dag
+++ b/dag/test/claim/spark/pair_serving_d0_front_door_real_execution_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.pair_serving_d0_front_door_real_execution
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, FilePath, List, Int, Port }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { second }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.shell
diff --git a/dag/test/claim/spark/pair_serving_d0_real_execution_witness_test.dag b/dag/test/claim/spark/pair_serving_d0_real_execution_witness_test.dag
index e9674803e41..70ee18dd6de 100644
--- a/dag/test/claim/spark/pair_serving_d0_real_execution_witness_test.dag
+++ b/dag/test/claim/spark/pair_serving_d0_real_execution_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.pair_serving_d0_real_execution
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, FilePath, List, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { second, measure_count, Measure }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.shell
diff --git a/dag/test/claim/spark/pair_serving_d0_release_witness_test.dag b/dag/test/claim/spark/pair_serving_d0_release_witness_test.dag
index 0a56904d5c4..b0498a90453 100644
--- a/dag/test/claim/spark/pair_serving_d0_release_witness_test.dag
+++ b/dag/test/claim/spark/pair_serving_d0_release_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.pair_serving_d0_release_witness
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, List }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { kibibyte, mebibyte, second }
 import std.content_hash { ContentHash, Sha256Hash, sha256_hex_digest, content_hash_equal, content_hash_of_value }
 import std.temporal_effect { HeldLease, held_lease, LeaseEpoch, LeaseRunningExpected }
diff --git a/dag/test/claim/spark/pair_serving_d0_witness_test.dag b/dag/test/claim/spark/pair_serving_d0_witness_test.dag
index dceef2a4f4a..f9ceac366be 100644
--- a/dag/test/claim/spark/pair_serving_d0_witness_test.dag
+++ b/dag/test/claim/spark/pair_serving_d0_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.pair_serving_d0_witness
 import std.logic { Bool }
 import std.types { String, NonEmptyStr, List, Int, Port }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { second }
 import std.content_hash { ContentHash, Sha256Hash, sha256_hex_digest, compare_content_hash, ContentHashEqual, ContentHashDifferent, ContentHashCrossFamilyIncomparable, content_hash_equal }
 import std.temporal_effect { HeldLease, held_lease, LeaseEpoch, LeaseRunningExpected }
diff --git a/dag/test/claim/spark/pair_serving_launch_receipt_witness_test.dag b/dag/test/claim/spark/pair_serving_launch_receipt_witness_test.dag
index d3e77a70422..76b2cde757f 100644
--- a/dag/test/claim/spark/pair_serving_launch_receipt_witness_test.dag
+++ b/dag/test/claim/spark/pair_serving_launch_receipt_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.pair_serving_launch_receipt_witness
 
 import std.types { Bool, String, Int, NonEmptyStr, List, EpochSecs }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat }
 import std.content_hash { ContentHash, Sha256Hash, Sha256Digest, Sha256DigestHex }
 import gunbc.spark.fabric_switch_observed { FabricGroup, FabricGroupA, FabricGroupB }
diff --git a/dag/test/claim/spark/prefill_batch_sweep_witness_test.dag b/dag/test/claim/spark/prefill_batch_sweep_witness_test.dag
index 8ded993137f..0388a496b7b 100644
--- a/dag/test/claim/spark/prefill_batch_sweep_witness_test.dag
+++ b/dag/test/claim/spark/prefill_batch_sweep_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.prefill_batch_sweep
 import std.types { Bool, List, String, NonEmptyStr }
 import std.nat { Nat }
 import std.measure { TokenCount, token_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.prefill_batch_sweep {
   PrefillProbe, ThreeTermFit, FitDerived, FitUnderdetermined,
   ReadingBasis, DirectMeasurement, DerivedAtCommonWorkload, PredictedOutsideMeasuredArm,
diff --git a/dag/test/claim/spark/relaunch_admission_axes_witness_test.dag b/dag/test/claim/spark/relaunch_admission_axes_witness_test.dag
index 30564bafdeb..2a2b4dfe77a 100644
--- a/dag/test/claim/spark/relaunch_admission_axes_witness_test.dag
+++ b/dag/test/claim/spark/relaunch_admission_axes_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.relaunch_admission_axes_witness_test
 
 import std.types { Bool, List, String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { length }
 import extdeps.vllm.engine_args { vllm_argv_without_admission_flags }
 import gunbc.spark.serving_relaunch_transaction {
diff --git a/dag/test/claim/spark/rendezvous_participation_witness_test.dag b/dag/test/claim/spark/rendezvous_participation_witness_test.dag
index 0c8d3e5237d..1f8eb73bc8a 100644
--- a/dag/test/claim/spark/rendezvous_participation_witness_test.dag
+++ b/dag/test/claim/spark/rendezvous_participation_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.rendezvous_participation_witness
 
 import std.types { String, Bool, NonEmptyStr, Int }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import extdeps.systemd.unit_file {
   SystemdServiceMode, SimpleMode, ExecMode, ForkingMode, OneshotMode, DbusMode, NotifyMode,
diff --git a/dag/test/claim/spark/scheduler_envelope_witness_test.dag b/dag/test/claim/spark/scheduler_envelope_witness_test.dag
index 429fbdca94a..44d27ebfcb3 100644
--- a/dag/test/claim/spark/scheduler_envelope_witness_test.dag
+++ b/dag/test/claim/spark/scheduler_envelope_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, List, String, NonEmptyStr }
 import gunbc.spark.serving_arm { glm53_native_launch_policy }
 import std.nat { Nat }
 import std.measure { token_count, basis_point, basis_point_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.server { vllm_source_revision }
 import extdeps.vllm.engine_args { IndexerKvDtypeOmitted,
   VllmSchedulerAdmissionRequest, VllmFullInputAdmissionRequest, VllmKvWatermarkRequest, FullInputAdmissionOmitted, FullInputAdmissionExplicit,
diff --git a/dag/test/claim/spark/serving_arm_launch_witness_test.dag b/dag/test/claim/spark/serving_arm_launch_witness_test.dag
index d0059855fc8..4bfcfa35e9a 100644
--- a/dag/test/claim/spark/serving_arm_launch_witness_test.dag
+++ b/dag/test/claim/spark/serving_arm_launch_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.serving_arm_launch_witness_test
 import std.types { Bool, String, NonEmptyStr, List }
 import gunbc.spark.serving_promotion { no_promotion_receipts }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { token_count_value }
 import extdeps.vllm.engine_args { vllm_basis_point_fraction_wire }
 import extdeps.docker.cli { DockerCreateSpec, DockerEnvAssignment, DockerDeviceMapping }
diff --git a/dag/test/claim/spark/serving_deployment_selection_witness_test.dag b/dag/test/claim/spark/serving_deployment_selection_witness_test.dag
index 9fe1948c178..c95fabb68de 100644
--- a/dag/test/claim/spark/serving_deployment_selection_witness_test.dag
+++ b/dag/test/claim/spark/serving_deployment_selection_witness_test.dag
@@ -8,7 +8,7 @@ import extdeps.vllm.engine_args {
   VllmMemoryRequest, VllmKvCacheDtypeRequest, KvFp8DsMla, KvFp8, KvAuto, KvNvfp4,
   vllm_kv_cache_dtype_wire, vllm_kv_cache_dtype_request_matching_wire,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.interval { IntervalReady, IntervalRefused }
 import gunbc.spark.pair_serving_observed {
   GroupRankFreeMemoryObserved, gib_hundredths_interval, group_rank_free_memory_upper,
diff --git a/dag/test/claim/spark/serving_load_probe_witness_test.dag b/dag/test/claim/spark/serving_load_probe_witness_test.dag
index 96028ddbdb2..a19dce8bf69 100644
--- a/dag/test/claim/spark/serving_load_probe_witness_test.dag
+++ b/dag/test/claim/spark/serving_load_probe_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.serving_load_probe_witness
 
 import std.types { Bool, String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { content_hash_of_value, serialize_content_hash }
 import extdeps.vllm.metrics { GenerationTokensTotal }
 import std.decimal { ExactDecimal, exact_decimal_sub, ExactDifference, ExactDifferenceUnrepresentable, ExactDifferenceOperandScaleRefused }
diff --git a/dag/test/claim/spark/serving_load_runner_witness_test.dag b/dag/test/claim/spark/serving_load_runner_witness_test.dag
index 8f7cd6650d4..a114bb46f3c 100644
--- a/dag/test/claim/spark/serving_load_runner_witness_test.dag
+++ b/dag/test/claim/spark/serving_load_runner_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.serving_load_runner_witness
 
 import std.types { Bool, String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.fleet_intent_network { srv9_host_lan_endpoint }
 import gunbc.fleet_host_identity { operator_host_srv9 }
 import gunbc.spark.serving_rank_observe { container_incarnation_id, ObservedRankIncarnation }
diff --git a/dag/test/claim/spark/serving_promotion_witness_test.dag b/dag/test/claim/spark/serving_promotion_witness_test.dag
index aa1fe036fb0..ebe389ecb89 100644
--- a/dag/test/claim/spark/serving_promotion_witness_test.dag
+++ b/dag/test/claim/spark/serving_promotion_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, List, String, NonEmptyStr }
 import std.nat { Nat }
 import std.measure { token_count, byte_size, allocator_block_count, second }
 import std.content_hash { ContentHash, content_hash_of_value }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { length }
 import extdeps.nvidia.nccl { NcclTransportIbVerbs }
 import extdeps.vllm.engine_args { KvFp8, SpeculativeDecodingOff, IndexerKvDtypeOmitted, vllm_scheduler_admission_omitted }
diff --git a/dag/test/claim/spark/snapshot_rail_replica_witness_test.dag b/dag/test/claim/spark/snapshot_rail_replica_witness_test.dag
index 1bf0fcf630b..8a8e0dc1073 100644
--- a/dag/test/claim/spark/snapshot_rail_replica_witness_test.dag
+++ b/dag/test/claim/spark/snapshot_rail_replica_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.snapshot_rail_replica_witness
 
 import std.types { Bool, String, List, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.snapshot_rail_replica { snapshot_entry_of, is_sha256_name, first_failure, snapshot_hub_paths }
 import gunbc.spark.group_checkpoint_materialize { checkpoint_snapshot }
 import gunbc.spark.serving_arm { Glm53NativeFp8 }
diff --git a/dag/test/claim/spark/spark_first_party_serving_witness_test.dag b/dag/test/claim/spark/spark_first_party_serving_witness_test.dag
index 1ee2a825b53..9a5d9b98ccf 100644
--- a/dag/test/claim/spark/spark_first_party_serving_witness_test.dag
+++ b/dag/test/claim/spark/spark_first_party_serving_witness_test.dag
@@ -28,7 +28,7 @@ import gunbc.spark.vllm_serving_launch {
 }
 import gunbc.spark.serving_offer { spark_serving_incarnation_unobserved_obligation }
 import std.measure { token_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.fleet_host_identity { operator_host_srv1, operator_host_srv5, operator_host_srv6 }
 import gunbc.spark.pair_serving_realization {
   spark_pair_model_path_in_container, spark_pair_desired_snapshot,
diff --git a/dag/test/claim/spark/spark_host_commitment_witness_test.dag b/dag/test/claim/spark/spark_host_commitment_witness_test.dag
index c640b261908..cc55b9ad984 100644
--- a/dag/test/claim/spark/spark_host_commitment_witness_test.dag
+++ b/dag/test/claim/spark/spark_host_commitment_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, List, String, NonEmptyStr }
 import std.algebra { FreeSemigroup, FreeMonoid, Empty, Cons }
 import product.host_identity { HostIdentity, host_identity_eq }
 import std.decl_ref { DeclarationRef, decl_ref, declaration_ref_display_key }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.pair_serving_authority_log { HostEffectRecord }
 import gunbc.fleet_host_identity { operator_host_srv5, operator_host_srv6, operator_host_srv7, operator_host_srv8, operator_host_srv9, operator_host_srv10, operator_host_srv11, operator_host_srv12, operator_host_srv1, operator_host_srv2 }
 import gunbc.spark.cell_role {
diff --git a/dag/test/claim/spark/spark_inspect_dropin_shape_witness_test.dag b/dag/test/claim/spark/spark_inspect_dropin_shape_witness_test.dag
index d2dd487b5f7..42e9c5bce82 100644
--- a/dag/test/claim/spark/spark_inspect_dropin_shape_witness_test.dag
+++ b/dag/test/claim/spark/spark_inspect_dropin_shape_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.spark_inspect_dropin_shape_witness_test
 
 import std.types { String, Bool, List, NonEmptyStr, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter, length, any }
 import gunbc.spark.managed_grant_reconcile {
   SparkInspectDropinShape, SharedInspectDropinShape, PerContainerInspectDropinShape, InspectDropinShapeUnobserved,
diff --git a/dag/test/claim/spark/spark_pair_serving_desired_witness_test.dag b/dag/test/claim/spark/spark_pair_serving_desired_witness_test.dag
index 16bc08e86bb..d741d646d23 100644
--- a/dag/test/claim/spark/spark_pair_serving_desired_witness_test.dag
+++ b/dag/test/claim/spark/spark_pair_serving_desired_witness_test.dag
@@ -5,7 +5,7 @@ import std.nat { Nat }
 import std.measure { token_count_value }
 import product.host_identity { host_identity_eq }
 import extdeps.network.ipv4 { ipv4_address_eq }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { token_count, basis_point }
 import extdeps.vllm.engine_args {
   vllm_kv_cache_dtype_wire, vllm_distributed_executor_backend_wire,
diff --git a/dag/test/claim/spark/spark_serving_offer_route_witness_test.dag b/dag/test/claim/spark/spark_serving_offer_route_witness_test.dag
index adef4314f85..7448f45b325 100644
--- a/dag/test/claim/spark/spark_serving_offer_route_witness_test.dag
+++ b/dag/test/claim/spark/spark_serving_offer_route_witness_test.dag
@@ -13,7 +13,7 @@ import gunbc.spark.first_party_serving {
   RealizationMatchesDeclaredConfiguration, RealizationReportedPathDiffers,
   RealizationDeclaredPathUnpinned, RealizationReadbackUnresolved,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.vllm_observed {
   ModelsRouteDocumentUnreadable, ModelsRouteRead, vllm_models_route_readback,
 }
diff --git a/dag/test/claim/spark/spark_snapshot_verify_wrapper_witness_test.dag b/dag/test/claim/spark/spark_snapshot_verify_wrapper_witness_test.dag
index e535b5250ec..d92b924fff6 100644
--- a/dag/test/claim/spark/spark_snapshot_verify_wrapper_witness_test.dag
+++ b/dag/test/claim/spark/spark_snapshot_verify_wrapper_witness_test.dag
@@ -6,7 +6,7 @@ import gunbc.spark.model_snapshot_materialize { spark_transfer_restart_propertie
 import extdeps.huggingface.hub { HubCacheEnvironment, hub_cache_root_for, hub_cache_environment_unset }
 import gunbc.spark.model_snapshot_acquisition { spark_hub_cache_root, HubCachePlacement }
 import std.types { List, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.model_snapshot_materialize {
   sentinel_command_line, read_instrument,
   InstrumentReading, InstrumentDidNotRun, InstrumentVerified, InstrumentRejectedTheSubject,
diff --git a/dag/test/claim/spark/standing_host_effect_recover_witness_test.dag b/dag/test/claim/spark/standing_host_effect_recover_witness_test.dag
index 54f865472b8..e041e4e15c0 100644
--- a/dag/test/claim/spark/standing_host_effect_recover_witness_test.dag
+++ b/dag/test/claim/spark/standing_host_effect_recover_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.standing_host_effect_recover_witness
 
 import std.types { Bool, String, List, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { second }
 import product.host_identity { HostIdentity }
 import product.capacity.event_chain { EventId }
diff --git a/dag/test/claim/spark/v41_capacity_measurement_witness_test.dag b/dag/test/claim/spark/v41_capacity_measurement_witness_test.dag
index 2eaec2ada79..d9c28dba4f5 100644
--- a/dag/test/claim/spark/v41_capacity_measurement_witness_test.dag
+++ b/dag/test/claim/spark/v41_capacity_measurement_witness_test.dag
@@ -13,7 +13,7 @@ import std.measure {
   milli_tokens_per_second, concurrent_request_hundredths, basis_point, basis_point_count, token_count_value,
 }
 import std.content_hash { Sha256Digest, Sha256DigestHex, content_hash_of_value }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.container.oci.digest { OciSha256Digest }
 import extdeps.vllm.server { VllmSourceRevision, vllm_source_revision }
diff --git a/dag/test/claim/spark/v41_checkpoint_materialize_witness_test.dag b/dag/test/claim/spark/v41_checkpoint_materialize_witness_test.dag
index 9e6fd1b0f35..9f086832008 100644
--- a/dag/test/claim/spark/v41_checkpoint_materialize_witness_test.dag
+++ b/dag/test/claim/spark/v41_checkpoint_materialize_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.v41_checkpoint_materialize_witness
 import std.types { Bool, String, List, NonEmptyStr }
 import std.nat { Nat }
 import std.measure { byte_size, byte_size_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import extdeps.deepseek.deepseek_v4_1_flash { DeepseekV41PublishedFile, deepseek_v4_1_flash_safetensors_tree_file_bytes }
 import gunbc.artifact_acquisition {
diff --git a/dag/test/claim/spark/v41_engram_differential_witness_test.dag b/dag/test/claim/spark/v41_engram_differential_witness_test.dag
index fc4cdf7ddd2..2c97edda949 100644
--- a/dag/test/claim/spark/v41_engram_differential_witness_test.dag
+++ b/dag/test/claim/spark/v41_engram_differential_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.v41_engram_differential_witness
 
 import std.types { Bool, List, NonEmptyStr, String }
 import std.measure { byte_size_count, byte_size }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { filter }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.container.oci.digest { render_oci_content_digest_wire }
diff --git a/dag/test/claim/spark/v41_engram_file_backed_witness_test.dag b/dag/test/claim/spark/v41_engram_file_backed_witness_test.dag
index 63ed17b407f..245063a242f 100644
--- a/dag/test/claim/spark/v41_engram_file_backed_witness_test.dag
+++ b/dag/test/claim/spark/v41_engram_file_backed_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, List, NonEmptyStr }
 import std.nat { Nat }
 import std.integer { UInt8 }
 import std.measure { ByteSize, byte_size, byte_size_count, microsecond, microsecond_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.v41_engram_row_store {
   V41CompleteStore, V41Placed, V41PlacementRefused, V41FixtureCorrespondenceHolds, V41PublishedTransformUnestablished, V41TransformUnfaithful,
   v41_place_row, v41_row_address, v41_transform_fixture, v41_row_store_magic_size,
diff --git a/dag/test/claim/spark/v41_engram_row_store_witness_test.dag b/dag/test/claim/spark/v41_engram_row_store_witness_test.dag
index 220b4c37339..44a789020c2 100644
--- a/dag/test/claim/spark/v41_engram_row_store_witness_test.dag
+++ b/dag/test/claim/spark/v41_engram_row_store_witness_test.dag
@@ -5,7 +5,7 @@ import std.nat { Nat }
 import std.integer { UInt8, qualified_octet_members }
 import std.content_hash { Sha256Digest, Sha256DigestHex, serialize_content_hash }
 import std.measure { byte_size_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.numeric.base16 { base16_decode_lower }
 import extdeps.toolchain.architecture_profile { BigEndian }
 import extdeps.safetensors.format { SafetensorsEntry, safetensors_entry, SafeF8E4M3, SafeF8E8M0, SafeF16 }
diff --git a/dag/test/claim/spark/v41_engram_runtime_witness_test.dag b/dag/test/claim/spark/v41_engram_runtime_witness_test.dag
index 0612f19e78d..38b4bee2724 100644
--- a/dag/test/claim/spark/v41_engram_runtime_witness_test.dag
+++ b/dag/test/claim/spark/v41_engram_runtime_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.v41_engram_runtime_witness
 import std.types { Bool, String, List, NonEmptyStr }
 import std.nat { Nat }
 import std.decl_ref { DeclarationRef }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import std.content_hash { ContentHash, Sha256Hash, Sha256Digest, Sha256DigestHex, serialize_content_hash, content_hash_of_value }
 import std.measure { byte_size, byte_size_count }
diff --git a/dag/test/claim/spark/v41_group_a_launch_witness_test.dag b/dag/test/claim/spark/v41_group_a_launch_witness_test.dag
index 3474235b1f8..c6579664e16 100644
--- a/dag/test/claim/spark/v41_group_a_launch_witness_test.dag
+++ b/dag/test/claim/spark/v41_group_a_launch_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.v41_group_a_launch_witness
 
 import std.types { Bool, String, List, NonEmptyStr }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { token_count, basis_point, kibibyte, kibibyte_count, mebibyte }
 import extdeps.systemd { Active }
 import gunbc.compute.host_occupancy { HostUnoccupied, HostOccupiedBy, ServingUnitActive }
diff --git a/dag/test/claim/spark/v41_produced_runtime_witness_test.dag b/dag/test/claim/spark/v41_produced_runtime_witness_test.dag
index e0117846c08..a77ac1330d9 100644
--- a/dag/test/claim/spark/v41_produced_runtime_witness_test.dag
+++ b/dag/test/claim/spark/v41_produced_runtime_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.v41_produced_runtime_witness
 
 import std.types { Bool, String, List, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash, Sha256Digest, Sha256DigestHex, serialize_content_hash }
 import extdeps.container.oci.digest { OciContentDigest, oci_sha256_content_digest }
 import extdeps.vllm.source_build { VllmContainerBuildRecipe, vllm_8d09804_sm121_recipe, vllm_deepseek_v4_1_sm12_revision }
diff --git a/dag/test/claim/spark/v41_published_row_store_witness_test.dag b/dag/test/claim/spark/v41_published_row_store_witness_test.dag
index c5783c11652..3f9375e37d0 100644
--- a/dag/test/claim/spark/v41_published_row_store_witness_test.dag
+++ b/dag/test/claim/spark/v41_published_row_store_witness_test.dag
@@ -4,7 +4,7 @@ import test.claim.vllm.vllm_engram_layout_witness { w_published_head_sizes }
 import std.types { Bool, String, List, NonEmptyStr }
 import std.nat { Nat }
 import std.measure { byte_size, byte_size_count }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { Sha256Digest, Sha256DigestHex, serialize_content_hash }
 import extdeps.deepseek.deepseek_v4_1_flash {
   deepseek_v4_1_flash_engram_sharded_entries, deepseek_v4_1_flash_engram_shard_files,
diff --git a/dag/test/claim/spark/v41_row_store_encode_run_witness_test.dag b/dag/test/claim/spark/v41_row_store_encode_run_witness_test.dag
index 24eb7cc2822..1a86a73f682 100644
--- a/dag/test/claim/spark/v41_row_store_encode_run_witness_test.dag
+++ b/dag/test/claim/spark/v41_row_store_encode_run_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, String, List, NonEmptyStr }
 import std.nat { Nat }
 import std.measure { byte_size, byte_size_count }
 import std.content_hash { Sha256Digest, Sha256DigestHex }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.v41_row_store_encode { V41StoreEncodeArgs }
 import gunbc.spark.v41_row_store_encode_run {
   V41StoreRun, V41StorePresent, V41StoreEncoded, V41StoreDigestUnread, V41StoreEncodeFailed, V41StorePresenceFailed,
diff --git a/dag/test/claim/spark/v41_row_store_encode_witness_test.dag b/dag/test/claim/spark/v41_row_store_encode_witness_test.dag
index 1194dfd8c98..9a85320dd5c 100644
--- a/dag/test/claim/spark/v41_row_store_encode_witness_test.dag
+++ b/dag/test/claim/spark/v41_row_store_encode_witness_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, String, List, NonEmptyStr, Int }
 import std.nat { Nat }
 import std.measure { byte_size, byte_size_count }
 import std.integer { UInt8, qualified_octet_members }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.numeric.base16 { base16_decode_lower }
 import extdeps.tools.sha256sum { Sha256FileDigest, Sha256FileDigestUnavailable, sha256sum_stdin_digest_via_shell }
 import extdeps.safetensors.format { SafeF8E4M3, SafeF8E8M0 }
diff --git a/dag/test/claim/spark/v41_row_store_readback_run_witness_test.dag b/dag/test/claim/spark/v41_row_store_readback_run_witness_test.dag
index 4059f1bd54b..529700d958d 100644
--- a/dag/test/claim/spark/v41_row_store_readback_run_witness_test.dag
+++ b/dag/test/claim/spark/v41_row_store_readback_run_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.v41_row_store_readback_run_witness
 import std.types { Bool, String, List, NonEmptyStr, Int }
 import std.nat { Nat }
 import std.measure { byte_size }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.exec.command { argv_words }
 import extdeps.tools.gnu_coreutils { od_hex_span_command }
 import extdeps.safetensors.format { SafeF8E4M3, SafeF8E8M0 }
diff --git a/dag/test/claim/spark/v41_runtime_candidate_witness_test.dag b/dag/test/claim/spark/v41_runtime_candidate_witness_test.dag
index 870b616ecd0..e2c98d021b2 100644
--- a/dag/test/claim/spark/v41_runtime_candidate_witness_test.dag
+++ b/dag/test/claim/spark/v41_runtime_candidate_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.v41_runtime_candidate_witness
 import std.types { Bool, String, Int, List, NonEmptyStr }
 import std.nat { Nat }
 import std.decl_ref { DeclarationRef, NamedField, decl_field_ref }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash, Sha256Hash, Sha256Digest, Sha256DigestHex, serialize_content_hash }
 import gunbc.spark.v41_engram_row_store { V41StoreReadback, V41StoreReadbackUnread, V41PublishedRowStoreKeyed, V41PublishedRowStoreRefused }
 import extdeps.gpu.types { GpuComputeCapability }
diff --git a/dag/test/claim/spark/v41_runtime_image_produce_witness_test.dag b/dag/test/claim/spark/v41_runtime_image_produce_witness_test.dag
index b7e852a4ce9..d2338a1b2ab 100644
--- a/dag/test/claim/spark/v41_runtime_image_produce_witness_test.dag
+++ b/dag/test/claim/spark/v41_runtime_image_produce_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.v41_runtime_image_produce_witness
 import std.types { Bool, String, List, NonEmptyStr }
 import extdeps.container.oci.digest { parse_oci_content_digest_wire }
 import extdeps.flashinfer.flashinfer { flashinfer_0_7_1rc1_wheels }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import gunbc.spark.v41_runtime_image_probe { V41ProbeRead, V41ProbeRefused }
 import gunbc.spark.v41_runtime_image_converge {
   V41ProducedRuntime, V41KernelWheelsVerified, V41KernelWheelVerificationRefused,
diff --git a/dag/test/claim/spark/v41_serving_load_witness_test.dag b/dag/test/claim/spark/v41_serving_load_witness_test.dag
index 179c8008794..ba5cc0a792f 100644
--- a/dag/test/claim/spark/v41_serving_load_witness_test.dag
+++ b/dag/test/claim/spark/v41_serving_load_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.spark.v41_serving_load_witness
 import std.types { Bool, List, NonEmptyStr, String }
 import std.nat { Nat }
 import std.measure { microsecond, microsecond_count, millisecond, millisecond_count, token_count_value }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import product.host_identity { HostIdentity }
 import extdeps.vllm.bench_serve { VllmBenchServeRequest }
 import extdeps.linux.psi { PsiReading, PsiRead, PsiUnparseable }
diff --git a/dag/test/claim/spark/v41_source_patch_converge_witness_test.dag b/dag/test/claim/spark/v41_source_patch_converge_witness_test.dag
index 80b73be2378..5810c03e2b2 100644
--- a/dag/test/claim/spark/v41_source_patch_converge_witness_test.dag
+++ b/dag/test/claim/spark/v41_source_patch_converge_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.v41_source_patch_converge_witness
 
 import std.types { Bool, String, List, NonEmptyStr }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.upsert_decision { Noop, Apply, Refuse }
 import std.realization_reconcile { Applied, NotApplied, classify_reconciled, EffectConverged, EffectNotConverged }
 import std.content_hash { Sha256Digest, Sha256DigestHex }
diff --git a/dag/test/claim/spark/v41_store_readback_witness_test.dag b/dag/test/claim/spark/v41_store_readback_witness_test.dag
index 8ce48643cf2..275e21fc204 100644
--- a/dag/test/claim/spark/v41_store_readback_witness_test.dag
+++ b/dag/test/claim/spark/v41_store_readback_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.spark.v41_store_readback_witness
 
 import std.types { Bool, String, List, NonEmptyStr, Int }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.numeric.base16 { byte_hex_lower }
 import extdeps.safetensors.format { SafeF8E4M3, SafeF8E8M0 }
 import extdeps.vllm.engram_layout { VllmEngramRankRows }
diff --git a/dag/test/claim/spark/vllm_allocation_plan_observe_witness_test.dag b/dag/test/claim/spark/vllm_allocation_plan_observe_witness_test.dag
index 07cb1b62a00..4efcb6eeb7e 100644
--- a/dag/test/claim/spark/vllm_allocation_plan_observe_witness_test.dag
+++ b/dag/test/claim/spark/vllm_allocation_plan_observe_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.vllm_allocation_plan_observe_witness
 
 import std.types { Bool, String, Int, NonEmptyStr, EpochSecs }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.content_hash { ContentHash, Sha256Hash, Sha256Digest, Sha256DigestHex }
 import std.measure {
   token_count, token_count_value,
diff --git a/dag/test/claim/spark/vllm_kv_layout_receipt_witness_test.dag b/dag/test/claim/spark/vllm_kv_layout_receipt_witness_test.dag
index 7141b6a9189..e34fecbbb2b 100644
--- a/dag/test/claim/spark/vllm_kv_layout_receipt_witness_test.dag
+++ b/dag/test/claim/spark/vllm_kv_layout_receipt_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.spark.vllm_kv_layout_receipt_witness
 
 import std.types { Bool, String, Int, NonEmptyStr, List, EpochSecs }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat }
 import std.content_hash { ContentHash, Sha256Hash, Sha256Digest, Sha256DigestHex }
 import std.measure {
diff --git a/dag/test/claim/spatial_connectivity_witness_test.dag b/dag/test/claim/spatial_connectivity_witness_test.dag
index 8b48642afdf..c26830155eb 100644
--- a/dag/test/claim/spatial_connectivity_witness_test.dag
+++ b/dag/test/claim/spatial_connectivity_witness_test.dag
@@ -15,7 +15,7 @@ import product.spatial_connectivity {
   ReachabilityEndpointMissing, ReachabilityEndpoint, TraversalStart, TraversalTarget,
   reachable_from, rooms_are_connected, world_is_connected, unreachable_room,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/dag/test/claim/spatial_edit_witness_test.dag b/dag/test/claim/spatial_edit_witness_test.dag
index 53510aef48e..af3465eba42 100644
--- a/dag/test/claim/spatial_edit_witness_test.dag
+++ b/dag/test/claim/spatial_edit_witness_test.dag
@@ -20,7 +20,7 @@ import product.spatial_edit {
   EditGeometryRefused, EditArithmeticRefused, EditFrameRefused,
   edits_to_patch, apply_edits, EditNotCompiled, EditRealized,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.spatial_frame {
   SpatialFrameRegistry, empty_frame_registry, register_frame, registry_with,
diff --git a/dag/test/claim/spatial_projection_witness_test.dag b/dag/test/claim/spatial_projection_witness_test.dag
index b415e561eab..b558d871b42 100644
--- a/dag/test/claim/spatial_projection_witness_test.dag
+++ b/dag/test/claim/spatial_projection_witness_test.dag
@@ -17,7 +17,7 @@ import product.spatial_projection {
   SceneProjectionRefused, DepthOrderAmbiguous,
   project_world, scene_rooms, painter_order,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/dag/test/claim/spatial_world_witness_test.dag b/dag/test/claim/spatial_world_witness_test.dag
index 8432308cfc1..774a4ab3828 100644
--- a/dag/test/claim/spatial_world_witness_test.dag
+++ b/dag/test/claim/spatial_world_witness_test.dag
@@ -18,7 +18,7 @@ import product.spatial_world {
   PlacedSpace, World, world, world_rooms, world_room_count, world_total_volume,
   WorldVariant, world_variant, realize_variant, variant_base,
 }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.spatial_frame {
   SpatialFrameRegistry, empty_frame_registry, register_frame, registry_with,
diff --git a/dag/test/claim/srv3/srv3_host_effect_realize_witness_test.dag b/dag/test/claim/srv3/srv3_host_effect_realize_witness_test.dag
index 4b739a6d8ad..16285a823f6 100644
--- a/dag/test/claim/srv3/srv3_host_effect_realize_witness_test.dag
+++ b/dag/test/claim/srv3/srv3_host_effect_realize_witness_test.dag
@@ -22,7 +22,7 @@ import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.shell { posix_command_v_check_argv, shell_test_is_executable_argv }
 import extdeps.apt { apt_installed_bin_path, apt_bin_dir }
 import gunbc.fleet_known_hosts_anchor { portable_remote_words }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/dag/test/claim/srv3/srv3_principal_privilege_witness_test.dag b/dag/test/claim/srv3/srv3_principal_privilege_witness_test.dag
index 03dcc1b7736..a51164f0432 100644
--- a/dag/test/claim/srv3/srv3_principal_privilege_witness_test.dag
+++ b/dag/test/claim/srv3/srv3_principal_privilege_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.srv3_principal_privilege_witness
 
 import std.logic { Bool }
 import std.types { String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.posix.identity {
   PosixUserId,
diff --git a/dag/test/claim/std_checkpointed_workspace_witness_test.dag b/dag/test/claim/std_checkpointed_workspace_witness_test.dag
index f16f92cf04e..bb880959136 100644
--- a/dag/test/claim/std_checkpointed_workspace_witness_test.dag
+++ b/dag/test/claim/std_checkpointed_workspace_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.std_checkpointed_workspace
 
 import std.types { String, NonEmptyStr, Int, Bool, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { Cons, Empty }
 import std.measure { byte_size, Nanosecond, nanosecond, nanosecond_count, ObservationInstant, ProcessMonotonic, SharedMonotonic, WallClock, InstantAfter, InstantIncomparable }
 import std.content_hash { Sha256Digest, Sha256DigestHex }
diff --git a/dag/test/claim/std_fabric_blob_witness_test.dag b/dag/test/claim/std_fabric_blob_witness_test.dag
index d6590f160b0..fbeb0c686ec 100644
--- a/dag/test/claim/std_fabric_blob_witness_test.dag
+++ b/dag/test/claim/std_fabric_blob_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.std_fabric_blob
 
 import std.types { String, NonEmptyStr, Bool }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
 import std.measure { byte_size, measure_count }
 import std.content_hash { sha256_hex_digest }
diff --git a/dag/test/claim/swift_rows_witness_test.dag b/dag/test/claim/swift_rows_witness_test.dag
index 05865b013a3..b5504db7a79 100644
--- a/dag/test/claim/swift_rows_witness_test.dag
+++ b/dag/test/claim/swift_rows_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.swift_rows_witness
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { String, Bool, List }
-import v2.std.optional { Present }
+import std.optional { Present }
 import v2.std.algebra { list_append }
 import v2.extdeps.languages.swift.syntax {
   SwiftSourceFile, SwiftDecl, SwiftStaticModifier, SwiftDocLineComment,
diff --git a/dag/test/claim/system_memory_component_witness_test.dag b/dag/test/claim/system_memory_component_witness_test.dag
index 733bfe2706c..fe6bf41dc18 100644
--- a/dag/test/claim/system_memory_component_witness_test.dag
+++ b/dag/test/claim/system_memory_component_witness_test.dag
@@ -3,7 +3,7 @@ module test.claim.system_memory_component_witness
 import std.types { Bool, List }
 import std.nat { Nat }
 import v2.std.algebra { filter }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.measure { bandwidth, gibibyte, gibibyte_to_byte_size }
 import extdeps.memory.types { MemoryFacts, Hbm }
 import extdeps.gpu.types { GpuModelCatalogRow }
diff --git a/dag/test/claim/toolchain_home_standing_witness_test.dag b/dag/test/claim/toolchain_home_standing_witness_test.dag
index 1dff8ae9c69..4265a12b42e 100644
--- a/dag/test/claim/toolchain_home_standing_witness_test.dag
+++ b/dag/test/claim/toolchain_home_standing_witness_test.dag
@@ -23,7 +23,7 @@ import gunbc.toolchain_workflow_steps { toolchain_home_isolation_step }
 import gunbc.witness_floor_workflow { witness_floor_workflow }
 import gunbc.fleet_converge_workflow { fleet_converge_workflow }
 import gunbc.fleet_desired_admission_workflow { fleet_desired_admission_workflow }
-import v2.std.optional { Present }
+import std.optional { Present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/dag/test/claim/vllm/vllm_engram_layout_witness_test.dag b/dag/test/claim/vllm/vllm_engram_layout_witness_test.dag
index f53de5e9c5d..ace8333af40 100644
--- a/dag/test/claim/vllm/vllm_engram_layout_witness_test.dag
+++ b/dag/test/claim/vllm/vllm_engram_layout_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.vllm.vllm_engram_layout_witness
 
 import std.types { Bool, List, Int }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.engram_layout {
   vllm_engram_is_prime, vllm_engram_primes_above, vllm_engram_layers_of_primes, vllm_engram_heads_per_layer,
   vllm_engram_rank_rows, vllm_engram_sum, vllm_engram_every_rank_has_heads,
diff --git a/dag/test/claim/vllm_kv_dtype_capability_witness_test.dag b/dag/test/claim/vllm_kv_dtype_capability_witness_test.dag
index 6f54dc0163e..c5305ae9182 100644
--- a/dag/test/claim/vllm_kv_dtype_capability_witness_test.dag
+++ b/dag/test/claim/vllm_kv_dtype_capability_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.vllm_kv_dtype_capability_witness_test
 
 import std.types { Bool, List, String, NonEmptyStr }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.algebra { any }
 import extdeps.vllm.engine_args {
   VllmKvCacheDtypeRequest, KvAuto, KvFp8, KvBf16, KvFp8DsMla,
diff --git a/dag/test/claim/vllm_kv_layout_witness_test.dag b/dag/test/claim/vllm_kv_layout_witness_test.dag
index 6526edcd52f..0d74990dd8c 100644
--- a/dag/test/claim/vllm_kv_layout_witness_test.dag
+++ b/dag/test/claim/vllm_kv_layout_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.vllm_kv_layout_witness
 
 import std.types { Bool, String, Int, NonEmptyStr, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.nat { Nat, nat_range_inclusive }
 import std.measure {
   TokenCount, token_count, token_count_value,
diff --git a/dag/test/claim/vllm_kv_request_vocabulary_witness_test.dag b/dag/test/claim/vllm_kv_request_vocabulary_witness_test.dag
index 407aab71e98..2de30ce72ad 100644
--- a/dag/test/claim/vllm_kv_request_vocabulary_witness_test.dag
+++ b/dag/test/claim/vllm_kv_request_vocabulary_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.vllm_kv_request_vocabulary_witness_test
 
 import std.types { Bool, String, NonEmptyStr }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.engine_args {
   VllmKvCacheDtypeRequest, KvNvfp4, KvNvfp4DsMla, KvFp8DsMla,
   vllm_kv_cache_dtype_wire, vllm_kv_cache_dtype_requests, vllm_kv_cache_dtype_request_matching_wire,
diff --git a/dag/test/claim/vllm_weight_offload_witness_test.dag b/dag/test/claim/vllm_weight_offload_witness_test.dag
index 68e4fd461b6..17dea84afbd 100644
--- a/dag/test/claim/vllm_weight_offload_witness_test.dag
+++ b/dag/test/claim/vllm_weight_offload_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.vllm_weight_offload_witness
 
 import std.types { Bool, NonEmptyStr }
 import std.nat { Nat }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.vllm.weight_offload {
   VllmFp8MoeBackend, Fp8MoeTriton, Fp8MoeDeepGemm, Fp8MoeMarlin,
   VllmUvaOffloadReading, VllmUvaOffload, VllmPrefetchOffload,
diff --git a/dag/test/claim/wet_receipt_route_standing_witness_test.dag b/dag/test/claim/wet_receipt_route_standing_witness_test.dag
index b587dae7535..862104fb993 100644
--- a/dag/test/claim/wet_receipt_route_standing_witness_test.dag
+++ b/dag/test/claim/wet_receipt_route_standing_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.wet_receipt_route_standing_witness
 
 import std.logic { Bool }
 import v2.std.algebra { fold_list, length }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.compiler.self_host.wet_receipt_route_standing {
   WetReceiptIdentity,
   WetReceiptRouteStanding,
diff --git a/dag/test/claim/witness_execution_class_live_census_test.dag b/dag/test/claim/witness_execution_class_live_census_test.dag
index c26a825ee3d..37538dbc93d 100644
--- a/dag/test/claim/witness_execution_class_live_census_test.dag
+++ b/dag/test/claim/witness_execution_class_live_census_test.dag
@@ -11,7 +11,7 @@ import v2.workflow.floor_discovery_source_authority {
 import extdeps.filesystem.filesystem_io { Filesystem }
 import gunbc.ci_layer_roots { witness_discovery_scan_dirs }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.algebra { fold_list, length, any }
 import std.types { Bool, Int, List, String }
 import std.selected_witness_bundle {
diff --git a/dag/test/claim/witness_execution_class_test.dag b/dag/test/claim/witness_execution_class_test.dag
index 0675826b88c..83a94cfc697 100644
--- a/dag/test/claim/witness_execution_class_test.dag
+++ b/dag/test/claim/witness_execution_class_test.dag
@@ -1,7 +1,7 @@
 module gunbc.test.claim.witness_execution_class_test
 
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree, SubstrateInputsOnly }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import std.types { Bool, List }
 import gunbc.witness_execution_class {
   NativeBlockedCause,
diff --git a/dag/test/claim/witness_row_cost_drift_witness_test.dag b/dag/test/claim/witness_row_cost_drift_witness_test.dag
index f1cc8165a10..952c827ad82 100644
--- a/dag/test/claim/witness_row_cost_drift_witness_test.dag
+++ b/dag/test/claim/witness_row_cost_drift_witness_test.dag
@@ -12,7 +12,7 @@ import gunbc.witness_row_cost {
 import std.logic { Bool }
 import std.nat { Nat }
 import std.measure { millisecond, millisecond_count }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.measure { ClockBasis, CpuClock, WallClock, clock_basis_eq }
 import v2.std.text { String }
 
diff --git a/dag/test/claim/workspace_checkpoint_instrument_witness_test.dag b/dag/test/claim/workspace_checkpoint_instrument_witness_test.dag
index 6e4f2dab6ee..d3d9bfe29e1 100644
--- a/dag/test/claim/workspace_checkpoint_instrument_witness_test.dag
+++ b/dag/test/claim/workspace_checkpoint_instrument_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.workspace_checkpoint_instrument
 
 import std.types { String, NonEmptyStr, Int, Bool, List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.algebra { Cons, Empty }
 import std.measure { byte_size, measure_count, Nanosecond, nanosecond, nanosecond_count }
 import std.content_hash { Sha256Digest, sha256_hex_digest }
diff --git a/dag/test/claim/workspace_network_observation_witness_test.dag b/dag/test/claim/workspace_network_observation_witness_test.dag
index ac28001802d..eafd498acfd 100644
--- a/dag/test/claim/workspace_network_observation_witness_test.dag
+++ b/dag/test/claim/workspace_network_observation_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.workspace_network_observation_witness_test
 
 import std.types { Bool, String }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import extdeps.linux.procfs { procfs_status_effective_uid }
 import extdeps.ethtool { ethtool_combined_channels, EthtoolCombinedChannelsCurrent, EthtoolCombinedChannelsUnreadable }
 import extdeps.linux.tun_fdinfo {
diff --git a/dag/test/claim/workspace_network_real_reader_witness_test.dag b/dag/test/claim/workspace_network_real_reader_witness_test.dag
index 5e2f950aaa1..fde277bb90a 100644
--- a/dag/test/claim/workspace_network_real_reader_witness_test.dag
+++ b/dag/test/claim/workspace_network_real_reader_witness_test.dag
@@ -1,7 +1,7 @@
 module test.claim.workspace_network_real_reader_witness_test
 
 import std.types { Bool }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.linux.procfs { procfs_status_effective_uid }
diff --git a/dag/test/claim/xorriso_path_list_witness_test.dag b/dag/test/claim/xorriso_path_list_witness_test.dag
index 8b118b200fd..a4c49552407 100644
--- a/dag/test/claim/xorriso_path_list_witness_test.dag
+++ b/dag/test/claim/xorriso_path_list_witness_test.dag
@@ -2,7 +2,7 @@ module test.claim.xorriso_path_list_witness
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { Bool, Int, List, NonEmptyStr, String }
-import v2.std.optional { Present }
+import std.optional { Present }
 import extdeps.exec.command { argv_words }
 import extdeps.tools.xorriso {
   XorrisoPathListCommand, XorrisoChownRecursive, XorrisoChgrpRecursive, XorrisoChmod,
diff --git a/fixtures/fixture_closure_rustc/bare_absent_fold_init.dag b/fixtures/fixture_closure_rustc/bare_absent_fold_init.dag
index 234a05bf605..4d54373f791 100644
--- a/fixtures/fixture_closure_rustc/bare_absent_fold_init.dag
+++ b/fixtures/fixture_closure_rustc/bare_absent_fold_init.dag
@@ -1,6 +1,6 @@
 module fixture.closure.rustc_bare_absent_fold_init
 
-import v2.std.optional { Absent, Optional, optional_present }
+import std.optional { Absent, Optional, optional_present }
 
 // Reduced rustc-red for gunbc.recurring_failure_mode accepted_source_emits_uncompilable_target
 // component (vii): a declared Optional return whose fold accumulator is initialized with the
diff --git a/fixtures/fixture_closure_rustc/typed_optional_fold_init_lambda.dag b/fixtures/fixture_closure_rustc/typed_optional_fold_init_lambda.dag
index a583975b4f6..bc4fb5390ec 100644
--- a/fixtures/fixture_closure_rustc/typed_optional_fold_init_lambda.dag
+++ b/fixtures/fixture_closure_rustc/typed_optional_fold_init_lambda.dag
@@ -1,6 +1,6 @@
 module fixture.closure.rustc_typed_optional_fold_init_lambda
 
-import v2.std.optional { Optional, optional_absent, optional_present }
+import std.optional { Optional, optional_absent, optional_present }
 
 // Second rustc-red for gunbc.recurring_failure_mode accepted_source_emits_uncompilable_target
 // component (vii), beside fixtures/fixture_closure_rustc/bare_absent_fold_init.dag.
diff --git a/src/v1/stage0/src/emitted_population.rs b/src/v1/stage0/src/emitted_population.rs
index fe1a9940cb9..f3f586969df 100644
--- a/src/v1/stage0/src/emitted_population.rs
+++ b/src/v1/stage0/src/emitted_population.rs
@@ -81,6 +81,7 @@
 // src/std_occurrence_binding_resolve.rs
 // src/std_occurrence_identity.rs
 // src/std_operator_realization.rs
+// src/std_optional.rs
 // src/std_primitive_projection.rs
 // src/std_process_termination.rs
 // src/std_realization_schedule.rs
diff --git a/src/v1/stage0/src/extdeps_external_authority.rs b/src/v1/stage0/src/extdeps_external_authority.rs
index b1c6d12a50c..cd04fc23cb5 100644
--- a/src/v1/stage0/src/extdeps_external_authority.rs
+++ b/src/v1/stage0/src/extdeps_external_authority.rs
@@ -7,6 +7,7 @@ use self::ScopeFinding::*;
 use crate::extdeps_uri::UriScheme::File;
 pub use crate::extdeps_uri::{Uri, UriScheme};
 pub use crate::std_decl_ref::DeclarationRef;
+pub use crate::std_optional::Optional;
 pub use crate::std_roster_frontier::declaration_ref_eq;
 pub use crate::std_types::{List, NonEmptyStr};
 use crate::v1_rt;
diff --git a/src/v1/stage0/src/extdeps_uri.rs b/src/v1/stage0/src/extdeps_uri.rs
index f73aa7f53eb..303138dbac4 100644
--- a/src/v1/stage0/src/extdeps_uri.rs
+++ b/src/v1/stage0/src/extdeps_uri.rs
@@ -18,6 +18,7 @@ use self::UriUnicodeScalarConstruction::*;
 use self::UriUtf8OctetConstruction::*;
 use self::UriValidatedScalarConstruction::*;
 pub use crate::std_algebra::trim;
+pub use crate::std_optional::Optional;
 pub use crate::std_types::{List, NonEmptyStr};
 pub use crate::std_unicode_types::{
     unicode_scalar_max_code_point, unicode_surrogate_first_code_point,
@@ -966,8 +967,7 @@ pub fn uri_percent_encode_outcomes_first_refusal(
 ) -> Option<Rc<UriPercentEncodeRefusalCause>> {
     outcomes.iter().cloned().fold(
         std::option::Option::None,
-        |acc: Option<Rc<UriPercentEncodeRefusalCause>>,
-         outcome: Rc<UriPercentEncodeScalarOutcome>| match acc.clone() {
+        |acc: _, outcome: Rc<UriPercentEncodeScalarOutcome>| match acc.clone() {
             Some(_) => acc.clone(),
             std::option::Option::None => match (*outcome.clone()).clone() {
                 UriPercentEncodeScalarOutcome::UriPercentEncodeScalarRefused {
diff --git a/src/v1/stage0/src/gunbc_rust_crate_package_ident.rs b/src/v1/stage0/src/gunbc_rust_crate_package_ident.rs
index f231222f42b..b72124672a4 100644
--- a/src/v1/stage0/src/gunbc_rust_crate_package_ident.rs
+++ b/src/v1/stage0/src/gunbc_rust_crate_package_ident.rs
@@ -10,6 +10,7 @@ pub use crate::std_decl_ref::{DeclField, DeclarationRef};
 pub use crate::std_dissolution::retires_dissolution;
 pub use crate::std_dissolution::DissolutionCondition;
 use crate::std_dissolution::DissolutionCondition::*;
+pub use crate::std_optional::Optional;
 pub use crate::std_types::{Bool, List, NonEmptyStr};
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
@@ -274,9 +275,7 @@ pub fn rust_crate_package_idents(package_names: Rc<Vec<String>>) -> Rc<PackageId
                 bindings: Rc::new(vec![]),
                 refusal: std::option::Option::None,
             }),
-            |acc: Rc<PackageIdentFold>, package_name: String| {
-                package_ident_step(acc, package_name.clone())
-            },
+            |acc: _, package_name: String| package_ident_step(acc, package_name.clone()),
         );
         match folded.refusal.clone() {
             Some(cause) => Rc::new(PackageIdentSetOutcome::PackageIdentSetRefused {
@@ -295,9 +294,7 @@ pub fn package_ident_bound(
 ) -> Option<String> {
     bindings.iter().cloned().fold(
         std::option::Option::None,
-        |found: Option<String>, binding: Rc<PackageIdentBinding>| match (binding
-            .package_name
-            .clone()
+        |found: _, binding: Rc<PackageIdentBinding>| match (binding.package_name.clone()
             == package_name.clone())
         {
             true => Some(binding.ident.clone()),
diff --git a/src/v1/stage0/src/gunbc_stage0_crate_partition_generated.rs b/src/v1/stage0/src/gunbc_stage0_crate_partition_generated.rs
index 795b5bc85a5..bb3cd103676 100644
--- a/src/v1/stage0/src/gunbc_stage0_crate_partition_generated.rs
+++ b/src/v1/stage0/src/gunbc_stage0_crate_partition_generated.rs
@@ -53,7 +53,7 @@ pub fn generated_partition_crate_rows() -> Rc<Vec<Rc<GeneratedPartitionCrateRow>
         package_name: "v1-stage0-std-core".to_string(),
         crate_dir: "src/v1/stage0_std_core".to_string(),
         kind: GeneratedPartitionCrateKind::GeneratedLayeredCoreCrate,
-        modules: Rc::new(vec!["std_content_hash".to_string(), "std_coercion".to_string(), "extdeps_currency_currency".to_string(), "std_decl_ref".to_string(), "std_keyed_row".to_string(), "std_keyed_roster".to_string(), "std_roster_frontier".to_string(), "std_dissolution".to_string(), "std_disposition".to_string(), "std_error_primitives".to_string(), "std_emit_model".to_string(), "std_measure".to_string(), "std_types".to_string(), "std_unicode_types".to_string(), "std_algebra".to_string(), "std_nat".to_string(), "std_node".to_string(), "std_syntax".to_string(), "std_computation".to_string(), "std_termination".to_string(), "std_checked_arithmetic".to_string(), "std_induction".to_string(), "std_graph".to_string(), "extdeps_uri".to_string(), "extdeps_external_authority".to_string(), "extdeps_posix_clock_gettime".to_string(), "extdeps_ietf_http_semantics".to_string(), "std_process_termination".to_string(), "std_primitive_projection".to_string(), "extdeps_container_oci_digest".to_string(), "extdeps_units_dimensionless".to_string(), "extdeps_units_iec_80000_13".to_string(), "extdeps_units_iso8601".to_string(), "extdeps_units_iso_80000_3".to_string(), "std_occurrence_identity".to_string(), "std_source_annotation".to_string(), "std_kernel_type_name".to_string(), "std_target_representation".to_string(), "std_literal_elaboration".to_string(), "std_operator_realization".to_string(), "std_import".to_string(), "v1_std_core".to_string(), "gunbc_rust_emitted_edge".to_string()]),
+        modules: Rc::new(vec!["std_content_hash".to_string(), "std_coercion".to_string(), "extdeps_currency_currency".to_string(), "std_decl_ref".to_string(), "std_keyed_row".to_string(), "std_keyed_roster".to_string(), "std_roster_frontier".to_string(), "std_dissolution".to_string(), "std_disposition".to_string(), "std_error_primitives".to_string(), "std_emit_model".to_string(), "std_measure".to_string(), "std_types".to_string(), "std_unicode_types".to_string(), "std_optional".to_string(), "std_algebra".to_string(), "std_nat".to_string(), "std_node".to_string(), "std_syntax".to_string(), "std_computation".to_string(), "std_termination".to_string(), "std_checked_arithmetic".to_string(), "std_induction".to_string(), "std_graph".to_string(), "extdeps_uri".to_string(), "extdeps_external_authority".to_string(), "extdeps_posix_clock_gettime".to_string(), "extdeps_ietf_http_semantics".to_string(), "std_process_termination".to_string(), "std_primitive_projection".to_string(), "extdeps_container_oci_digest".to_string(), "extdeps_units_dimensionless".to_string(), "extdeps_units_iec_80000_13".to_string(), "extdeps_units_iso8601".to_string(), "extdeps_units_iso_80000_3".to_string(), "std_occurrence_identity".to_string(), "std_source_annotation".to_string(), "std_kernel_type_name".to_string(), "std_target_representation".to_string(), "std_literal_elaboration".to_string(), "std_operator_realization".to_string(), "std_import".to_string(), "v1_std_core".to_string(), "gunbc_rust_emitted_edge".to_string()]),
         reexport_packages: Rc::new(vec!["v1-stage0-runtime".to_string()]),
         carries_non_empty_wrappers: false,
     }), Rc::new(GeneratedPartitionCrateRow {
diff --git a/src/v1/stage0/src/gunbc_structural_realization_bindings.rs b/src/v1/stage0/src/gunbc_structural_realization_bindings.rs
index 3689928ad56..7b3cf231f9b 100644
--- a/src/v1/stage0/src/gunbc_structural_realization_bindings.rs
+++ b/src/v1/stage0/src/gunbc_structural_realization_bindings.rs
@@ -131,7 +131,7 @@ pub fn kernel_mint_declaration_rows() -> Rc<Vec<Rc<KernelMintDeclaration>>> {
             static CACHED: Rc<Vec<Rc<KernelMintDeclaration>>> = {
                 Rc::new(vec![Rc::new(KernelMintDeclaration {
         minted_name: kernel_optional_mint_name(),
-        declaration: crate::std_decl_ref::decl_ref("v2.std.optional".to_string(), "Optional".to_string()),
+        declaration: crate::std_decl_ref::decl_ref("std.optional".to_string(), "Optional".to_string()),
     })])
             };
         }
diff --git a/src/v1/stage0/src/namespace_baseline.rs b/src/v1/stage0/src/namespace_baseline.rs
index 2a3bbde0866..5f589f33baf 100644
--- a/src/v1/stage0/src/namespace_baseline.rs
+++ b/src/v1/stage0/src/namespace_baseline.rs
@@ -1985,7 +1985,8 @@ pub fn load_parse_environment_with_closure(
     let dest = revision_scratch_root("parse-env");
     // If the base's closure has a member the head's does not, the materialized set is incomplete
     // and resolution refuses as ClosureNotEvaluable -- a located refusal, not a fabricated read.
-    let outcome = materialize_environment_closure_at(repo, revision, &dest, closure)
+    let carried = closure_members_carried_at(repo, revision, closure)?;
+    let outcome = materialize_environment_closure_at(repo, revision, &dest, &carried)
         .and_then(|()| evaluate_environment_in(&dest, revision));
     let _ = std::fs::remove_dir_all(&dest);
     outcome
@@ -2050,6 +2051,29 @@ impl Default for LiveDagIndex {
     }
 }
 
+/// The members of a LIVE-TREE closure that `revision` carries.
+///
+/// Every closure here is resolved over the live tree, which is the head, and is then materialized
+/// at another revision, usually the base. A file the revision does not carry cannot belong to that
+/// revision's closure, so handing it to `git archive` only refused the whole read as a missing
+/// pathspec: every module newly imported into the environment or the kernel-types closure turned the
+/// base reconstruction into NotEvaluated. Comparisons that decide agreement still run over the full
+/// closure, where an absent base blob differs from any head blob. A base member the head's closure
+/// no longer names is not recovered here; resolution then refuses, located, as before.
+fn closure_members_carried_at(
+    repo: &std::path::Path,
+    revision: &str,
+    closure: &BTreeSet<String>,
+) -> Result<BTreeSet<String>, EnvironmentLoadRefusal> {
+    let mut carried = BTreeSet::new();
+    for path in closure {
+        if blob_id_at(repo, revision, path)?.is_some() {
+            carried.insert(path.clone());
+        }
+    }
+    Ok(carried)
+}
+
 /// The repository-relative files of the live tree's resolved closure rooted at `entry_rel`.
 fn closure_paths_of(
     entry_rel: &str,
@@ -2183,7 +2207,8 @@ pub fn kernel_names_at(
     revision: &str,
     live: &LiveDagIndex,
 ) -> Result<BTreeSet<String>, EnvironmentLoadRefusal> {
-    let closure = closure_paths_of(KERNEL_TYPES_PATH, live)?;
+    let closure =
+        closure_members_carried_at(repo, revision, &closure_paths_of(KERNEL_TYPES_PATH, live)?)?;
     let dest = revision_scratch_root("kernel-set");
     let outcome = materialize_revision_paths(
         repo,
diff --git a/src/v1/stage0/src/std_algebra.rs b/src/v1/stage0/src/std_algebra.rs
index 9dbb6098ff7..56450a05e83 100644
--- a/src/v1/stage0/src/std_algebra.rs
+++ b/src/v1/stage0/src/std_algebra.rs
@@ -12,6 +12,7 @@ use self::Ordering::*;
 use crate::std_error_primitives::DivError::*;
 use crate::std_error_primitives::Result::*;
 pub use crate::std_error_primitives::{DivError, Result};
+pub use crate::std_optional::Optional;
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
 use crate::NonEmptyBTreeSet;
diff --git a/src/v1/stage0/src/std_checked_arithmetic.rs b/src/v1/stage0/src/std_checked_arithmetic.rs
index 43005f757a1..edb992e15e2 100644
--- a/src/v1/stage0/src/std_checked_arithmetic.rs
+++ b/src/v1/stage0/src/std_checked_arithmetic.rs
@@ -6,6 +6,7 @@ use self::CheckedIntOperands::*;
 use self::CheckedNat::*;
 use self::IntegerArithmeticOperation::*;
 pub use crate::std_nat::Nat;
+pub use crate::std_optional::Optional;
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
 use crate::NonEmptyBTreeSet;
diff --git a/src/v1/stage0/src/std_computation.rs b/src/v1/stage0/src/std_computation.rs
index 07ac2fe3f43..2db1e514e75 100644
--- a/src/v1/stage0/src/std_computation.rs
+++ b/src/v1/stage0/src/std_computation.rs
@@ -14,6 +14,7 @@ use crate::std_algebra::AlgebraProfile::{
     OrderedRingProfile, OrderedSemiringProfile, PartialFunctionProfile,
     PointwisePowerCollectionProfile,
 };
+pub use crate::std_optional::Optional;
 pub use crate::std_termination::positive_descent_count;
 use crate::std_termination::DescentEvidence::{DescentUnknown, NonIncreasing, Strict};
 use crate::std_termination::PositiveDescentAmount::{AdditionalStep, OneStep};
diff --git a/src/v1/stage0/src/std_content_hash.rs b/src/v1/stage0/src/std_content_hash.rs
index 92bd57b93eb..7783f80299e 100644
--- a/src/v1/stage0/src/std_content_hash.rs
+++ b/src/v1/stage0/src/std_content_hash.rs
@@ -4,6 +4,7 @@
 use self::ContentHash::*;
 use self::ContentHashComparison::*;
 use self::HashFamily::*;
+pub use crate::std_optional::Optional;
 pub use crate::std_types::{Bool, NonEmptyStr};
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
diff --git a/src/v1/stage0/src/std_effects.rs b/src/v1/stage0/src/std_effects.rs
index 5a9ef07f4b1..870bcedf0e5 100644
--- a/src/v1/stage0/src/std_effects.rs
+++ b/src/v1/stage0/src/std_effects.rs
@@ -16,6 +16,7 @@ use crate::extdeps_ietf_http_semantics::HttpMethod::{
 };
 pub use crate::extdeps_uri_path::PathTemplate;
 pub use crate::extdeps_uri_path::{has_path_params, last_path_param};
+pub use crate::std_optional::Optional;
 pub use crate::std_realization_schedule::string_list_eq;
 pub use crate::std_types::List;
 use crate::v1_rt;
diff --git a/src/v1/stage0/src/std_induction.rs b/src/v1/stage0/src/std_induction.rs
index 93b1c9f3452..529d13e505a 100644
--- a/src/v1/stage0/src/std_induction.rs
+++ b/src/v1/stage0/src/std_induction.rs
@@ -25,6 +25,7 @@ use crate::std_computation::SizeBound::{ArithmeticParam, CollectionSize, Forever
 pub use crate::std_computation::{
     CallPattern, IterationPrimitive, LoweringTarget, ShrinkFactor, SizeBound,
 };
+pub use crate::std_optional::Optional;
 use crate::std_termination::DescentEvidence::{DescentUnknown, NonIncreasing, Strict};
 use crate::std_termination::PositiveDescentAmount::OneStep;
 use crate::std_termination::ProportionalDivisor::DivideByTwo;
diff --git a/src/v1/stage0/src/std_integer.rs b/src/v1/stage0/src/std_integer.rs
index 2e29438936c..bbdca20220c 100644
--- a/src/v1/stage0/src/std_integer.rs
+++ b/src/v1/stage0/src/std_integer.rs
@@ -12,6 +12,7 @@ pub use crate::std_machine_constraints::PointerWidth;
 pub use crate::std_machine_constraints::{Compose, MachineWidth};
 pub use crate::std_measure::{bit_width, bit_width_count, bits_per_byte};
 pub use crate::std_nat::Nat;
+pub use crate::std_optional::Optional;
 pub use crate::std_types::gt_zero;
 pub use crate::std_types::List;
 use crate::v1_rt;
diff --git a/src/v1/stage0/src/std_keyed_roster.rs b/src/v1/stage0/src/std_keyed_roster.rs
index e16314b4f7a..f57ee9ac427 100644
--- a/src/v1/stage0/src/std_keyed_roster.rs
+++ b/src/v1/stage0/src/std_keyed_roster.rs
@@ -6,6 +6,7 @@ use self::KeyedRosterInsert::*;
 use self::KeyedRosterSecondRowScan::*;
 pub use crate::std_keyed_row::keyed_row_find;
 pub use crate::std_keyed_row::KeyedRow;
+pub use crate::std_optional::Optional;
 pub use crate::std_types::{Bool, List};
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
diff --git a/src/v1/stage0/src/std_keyed_row.rs b/src/v1/stage0/src/std_keyed_row.rs
index 3db35f07175..cff355b8e2b 100644
--- a/src/v1/stage0/src/std_keyed_row.rs
+++ b/src/v1/stage0/src/std_keyed_row.rs
@@ -1,6 +1,7 @@
 // Generated by v1 compiler -- do not edit.
 // Source module: std.keyed_row
 
+pub use crate::std_optional::Optional;
 pub use crate::std_types::List;
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
diff --git a/src/v1/stage0/src/std_measure.rs b/src/v1/stage0/src/std_measure.rs
index 1ee0f76f418..b6fbef25341 100644
--- a/src/v1/stage0/src/std_measure.rs
+++ b/src/v1/stage0/src/std_measure.rs
@@ -40,6 +40,7 @@ pub use crate::std_dissolution::unbound_dissolution;
 pub use crate::std_dissolution::DissolutionCondition;
 use crate::std_dissolution::DissolutionCondition::*;
 pub use crate::std_nat::Nat;
+pub use crate::std_optional::Optional;
 pub use crate::std_types::{Bool, NonEmptyStr};
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
diff --git a/src/v1/stage0/src/std_nat.rs b/src/v1/stage0/src/std_nat.rs
index 8899d347a96..3e6fb80fef5 100644
--- a/src/v1/stage0/src/std_nat.rs
+++ b/src/v1/stage0/src/std_nat.rs
@@ -5,6 +5,7 @@ use self::NatDivision::*;
 use self::NatSubtraction::*;
 use crate::std_algebra::Ordering::{Equal, Greater, Less};
 pub use crate::std_algebra::{CommutativeMonoid, CommutativeSemiring, Ordering};
+pub use crate::std_optional::Optional;
 pub use crate::std_types::{Bool, List};
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
diff --git a/src/v1/stage0/src/std_occurrence_identity.rs b/src/v1/stage0/src/std_occurrence_identity.rs
index 80742b3123d..299c52ca17a 100644
--- a/src/v1/stage0/src/std_occurrence_identity.rs
+++ b/src/v1/stage0/src/std_occurrence_identity.rs
@@ -13,6 +13,7 @@ pub use crate::std_content_hash::Fnv1a64Structural;
 pub use crate::std_dissolution::unbound_dissolution;
 pub use crate::std_dissolution::DissolutionCondition;
 use crate::std_dissolution::DissolutionCondition::*;
+pub use crate::std_optional::Optional;
 pub use crate::std_types::{Bool, List, Map, SourceSpan};
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
diff --git a/src/v1/stage0/src/std_optional.rs b/src/v1/stage0/src/std_optional.rs
new file mode 100644
index 00000000000..aa8f7d3ea6d
--- /dev/null
+++ b/src/v1/stage0/src/std_optional.rs
@@ -0,0 +1,26 @@
+// Generated by v1 compiler -- do not edit.
+// Source module: std.optional
+
+use crate::v1_rt;
+use crate::v1_rt::{VecCompat, VecJoin};
+use crate::NonEmptyBTreeSet;
+use crate::NonEmptyVec;
+use im::{vector as vec, HashMap, OrdSet as BTreeSet, Vector as Vec};
+use std::rc::Rc;
+
+pub type Optional<T> = Option<T>;
+
+pub fn optional_absent<T: Clone>() -> Option<T> {
+    std::option::Option::None
+}
+
+pub fn optional_present<T: Clone>(value: T) -> Option<T> {
+    Some(value.clone())
+}
+
+pub fn optional_prefer_first_present<T: Clone>(left: Option<T>, right: Option<T>) -> Option<T> {
+    match left.clone() {
+        Some(_) => left.clone(),
+        std::option::Option::None => right,
+    }
+}
diff --git a/src/v1/stage0/src/std_realization_schedule.rs b/src/v1/stage0/src/std_realization_schedule.rs
index 590be598156..452e02181d4 100644
--- a/src/v1/stage0/src/std_realization_schedule.rs
+++ b/src/v1/stage0/src/std_realization_schedule.rs
@@ -38,6 +38,7 @@ pub use crate::std_measure::{
 };
 pub use crate::std_measure::{ByteSize, ClockBasis, Measure, Millisecond, Second, Watt};
 pub use crate::std_nat::Nat;
+pub use crate::std_optional::Optional;
 pub use crate::std_process_termination::ProcessTermination;
 use crate::std_process_termination::ProcessTermination::{
     ProcessExited, ProcessSignaled, ProcessTerminationUnobserved,
diff --git a/src/v1/stage0/src/std_source_annotation.rs b/src/v1/stage0/src/std_source_annotation.rs
index 1fe4817c03e..64e9feefea5 100644
--- a/src/v1/stage0/src/std_source_annotation.rs
+++ b/src/v1/stage0/src/std_source_annotation.rs
@@ -8,6 +8,7 @@ use self::AnnotationPlacement::*;
 pub use crate::std_algebra::FreeSemigroup;
 pub use crate::std_coercion::unicode_scalar_unfold;
 pub use crate::std_occurrence_identity::OccurrenceId;
+pub use crate::std_optional::Optional;
 pub use crate::std_types::{Bool, List, SourceSpan};
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
diff --git a/src/v1/stage0/src/std_termination.rs b/src/v1/stage0/src/std_termination.rs
index c33171449aa..5f13fa6fee0 100644
--- a/src/v1/stage0/src/std_termination.rs
+++ b/src/v1/stage0/src/std_termination.rs
@@ -8,6 +8,7 @@ use self::ProportionalDivisor::*;
 use self::RankingDimension::*;
 use crate::std_algebra::Ordering::*;
 pub use crate::std_algebra::{BoundedLattice, Ordering};
+pub use crate::std_optional::Optional;
 pub use crate::std_types::{List, Map};
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
diff --git a/src/v1/stage0/src/std_types.rs b/src/v1/stage0/src/std_types.rs
index 255f1f7009f..c804d2f40a8 100644
--- a/src/v1/stage0/src/std_types.rs
+++ b/src/v1/stage0/src/std_types.rs
@@ -11,6 +11,7 @@ pub use crate::std_algebra::{
     carrier_container_arity_rows, carrier_container_roster_map, kernel_algebra_profile,
 };
 pub use crate::std_algebra::{FinitePowerSet, FinitelySupportedFunction, FreeMonoid};
+pub use crate::std_optional::Optional;
 pub use crate::std_unicode_types::unicode_scalar;
 use crate::v1_rt;
 use crate::v1_rt::{VecCompat, VecJoin};
diff --git a/src/v1/stage0_std_core/src/lib.rs b/src/v1/stage0_std_core/src/lib.rs
index 6e2f7f1cab6..9078ed2d1b5 100644
--- a/src/v1/stage0_std_core/src/lib.rs
+++ b/src/v1/stage0_std_core/src/lib.rs
@@ -63,6 +63,9 @@ pub mod std_types;
 #[path = "../../stage0/src/std_unicode_types.rs"]
 pub mod std_unicode_types;
 #[rustfmt::skip]
+#[path = "../../stage0/src/std_optional.rs"]
+pub mod std_optional;
+#[rustfmt::skip]
 #[path = "../../stage0/src/std_algebra.rs"]
 pub mod std_algebra;
 #[rustfmt::skip]
diff --git a/src/v2/cli/compile_cli.dag b/src/v2/cli/compile_cli.dag
index 6b45306a672..bc326c90c25 100644
--- a/src/v2/cli/compile_cli.dag
+++ b/src/v2/cli/compile_cli.dag
@@ -33,7 +33,7 @@ import v2.std.lens_verdict {
 }
 import v2.std.node { Atom, Node, Symbol, TypeNode, node_synthetic }
 import v2.std.qualified_name { qualified_name_from_dotted_string }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.provenance { SpanIndex }
 import v2.std.text { String }
 
diff --git a/src/v2/cli/if_arm_reader_differential.dag b/src/v2/cli/if_arm_reader_differential.dag
index 7315b1b311d..d9347aaea27 100644
--- a/src/v2/cli/if_arm_reader_differential.dag
+++ b/src/v2/cli/if_arm_reader_differential.dag
@@ -32,7 +32,7 @@ import v2.std.diagnostic { Accepted, Diagnostics, NonEmptyDiagnostics, Rejected,
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.integer { integer_int_to_decimal_string }
 import v2.std.node { Node, Symbol, is_empty_conj_root, symbol_lexeme }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.provenance { SpanIndex, node_occurrence_id_optional, span_index_textual_locus_optional }
 import v2.std.text { String }
 
diff --git a/src/v2/compiler/00_compile.dag b/src/v2/compiler/00_compile.dag
index 196741f932a..c39846fb6cd 100644
--- a/src/v2/compiler/00_compile.dag
+++ b/src/v2/compiler/00_compile.dag
@@ -84,7 +84,7 @@ import v2.std.demand_engine {
   demand_identity_eq,
   demand_identity_key
 }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.provenance { SpanIndex, node_occurrence_id_optional, span_index_empty, span_index_textual_locus_optional }
 import v2.std.source_position { source_line_col_at_byte }
 import std.content_hash { Fnv1a64Structural, content_hash_atom, content_hash_combine_structural }
@@ -246,7 +246,7 @@ import v2.std.diagnostic {
 import v2.std.node { Arrow, Atom, ComputationNode, Edge, Node, NodeFold, NodeKind, Positional, Symbol, TypeNode, fold_node, symbol_intern_lexeme, symbol_lexeme, Authored, StructuralLabel }
 import v2.compiler.inferred_tree { AuthoredOccurrenceCollision, authored_occurrence_collisions }
 import v2.std.node_query { find_arrow_body_child, find_named_child }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name { QualifiedName, qualified_name_from_dotted_string, qualified_name_init, qualified_name_snoc, qualified_name_to_dotted_string }
 import v2.std.cross_tree.import_model { SourceRootRef }
 import v2.std.cross_tree.resolution {
diff --git a/src/v2/compiler/01_tokenize.dag b/src/v2/compiler/01_tokenize.dag
index 0be90cd11c4..3c5077ef47e 100644
--- a/src/v2/compiler/01_tokenize.dag
+++ b/src/v2/compiler/01_tokenize.dag
@@ -3,7 +3,7 @@ module v2.compiler.tokenize
 import std.coercion { unicode_scalar_unfold, unicode_scalar_fold }
 import std.types { List }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup, list_at_optional }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.diagnostic { Accepted, ByteRange, Diagnostic, ExternalContractUnknown, Locus, None, Outcome, Rejected, Textual, Unavailable, UserInputBoundary, WholeFile, diagnostics_singleton }
 import v2.std.node { Symbol }
 import std.algebra { Cons, Empty, list_append, list_snoc_item }
diff --git a/src/v2/compiler/02_parse.dag b/src/v2/compiler/02_parse.dag
index 686461bb4e0..90c473d8748 100644
--- a/src/v2/compiler/02_parse.dag
+++ b/src/v2/compiler/02_parse.dag
@@ -7,7 +7,7 @@ import v2.compiler.parse_diagnostic {
   parse_overlap_residue_stage_diagnostic_at,
   parse_stage_diagnostic_core
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
@@ -88,7 +88,7 @@ import v2.std.collection {
   map_insert,
   map_lookup
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/compiler/03_name_resolve.dag b/src/v2/compiler/03_name_resolve.dag
index a6da8d81fe1..04c93a6c8ca 100644
--- a/src/v2/compiler/03_name_resolve.dag
+++ b/src/v2/compiler/03_name_resolve.dag
@@ -39,7 +39,7 @@ import v2.compiler.parse { parse_tree_projection_edge }
 import std.algebra { Cons, Empty, FreeMonoid, list_snoc_item }
 import v2.std.algebra { fold_list }
 import v2.std.collection { Absent, Map, Present, PointwisePower, empty_map, map_get, map_lookup, map_insert, optional_absent, optional_present }
-import v2.std.optional { Optional }
+import std.optional { Optional }
 import v2.std.diagnostic {
   Accepted,
   Diagnostic,
diff --git a/src/v2/compiler/03_resolve.dag b/src/v2/compiler/03_resolve.dag
index 15b388adbb9..cda409b2df4 100644
--- a/src/v2/compiler/03_resolve.dag
+++ b/src/v2/compiler/03_resolve.dag
@@ -48,7 +48,7 @@ import v2.std.collection {
   map_lookup
 }
 import v2.std.grammar { node_atom_identity_optional }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/04_infer.dag b/src/v2/compiler/04_infer.dag
index 4e24e41a19b..93fcded72d2 100644
--- a/src/v2/compiler/04_infer.dag
+++ b/src/v2/compiler/04_infer.dag
@@ -62,7 +62,7 @@ import v2.std.collection {
   map_insert,
   map_lookup
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/05_emit_orchestration.dag b/src/v2/compiler/05_emit_orchestration.dag
index 2f978945a61..b3a44e42392 100644
--- a/src/v2/compiler/05_emit_orchestration.dag
+++ b/src/v2/compiler/05_emit_orchestration.dag
@@ -120,7 +120,7 @@ import v2.std.collection {
   map_insert,
   map_lookup
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/compiler/05_eval.dag b/src/v2/compiler/05_eval.dag
index a575af1d86c..3950432e690 100644
--- a/src/v2/compiler/05_eval.dag
+++ b/src/v2/compiler/05_eval.dag
@@ -38,7 +38,7 @@ import v2.std.qualified_name {
   qualified_name_snoc,
   qualified_name_to_dotted_string, declaration_reference_path_optional, lexical_reference_label_optional, parameter_reference_path_optional }
 import v2.std.grammar { node_atom_identity_optional }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/06_translate.dag b/src/v2/compiler/06_translate.dag
index 8635a15c772..230d2bcae89 100644
--- a/src/v2/compiler/06_translate.dag
+++ b/src/v2/compiler/06_translate.dag
@@ -187,7 +187,7 @@ import v2.std.qualified_name {
   parameter_reference_path_optional,
   lexical_reference_label_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/07_target_carriers.dag b/src/v2/compiler/07_target_carriers.dag
index 1744706031e..f14dbe12cb2 100644
--- a/src/v2/compiler/07_target_carriers.dag
+++ b/src/v2/compiler/07_target_carriers.dag
@@ -3,7 +3,7 @@ module v2.compiler.target_carriers
 import extdeps.communication.fidelity_carriers { decode_fidelity_merge }
 import extdeps.communication.medium { DecodeFidelity, Lossless, Lossy, Medium }
 import v2.std.compilers.target_model { TargetModel }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/compiler/body_lowering_fold.dag b/src/v2/compiler/body_lowering_fold.dag
index 7db7630f653..6386e88a2cc 100644
--- a/src/v2/compiler/body_lowering_fold.dag
+++ b/src/v2/compiler/body_lowering_fold.dag
@@ -91,7 +91,7 @@ import v2.std.collection {
 import std.types { Map, List }
 import std.resource_contract { ResourceKind, ResourceMode }
 import v2.std.resource_declaration { resource_kind_of_label, resource_mode_of_label }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/body_producer_forward.dag b/src/v2/compiler/body_producer_forward.dag
index b5b608ebb06..1513b491005 100644
--- a/src/v2/compiler/body_producer_forward.dag
+++ b/src/v2/compiler/body_producer_forward.dag
@@ -8,7 +8,7 @@ import v2.std.diagnostic { Accepted, Diagnostic, ExternalContractUnknown, Outcom
 import v2.std.grammar { grammar_relation_row_forward_production_selection }
 import v2.std.integer { Int }
 import v2.std.node { Arrow, Atom, ComputationNode, Node, Symbol, TypeNode, node_synthetic }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 data body_producer_forward_note: String = "General body producer forward fold (general-body-producer-design §3, wave2_prep_design §3): production-identity-keyed GrammarRelationRow selection at the normalize/body-producer seam — the forward reading of the same rows the emitter reads backward. First consumer of ObligationForwardDeterminism (exactly-one row per surface identity) and the production-identity selection helper grammar_relation_row_forward_production_selection. Behavior lowering (match/if/let/loop/…) dispatches through body_lower_fold in v2.compiler.body_lowering_fold until Slice 4 deletes that interim module wholesale. dissolve-on: body_lowering_fold.dag absent — this module owns the full forward slot-map apply."
diff --git a/src/v2/compiler/dependency_demand.dag b/src/v2/compiler/dependency_demand.dag
index acb609cf15b..4c90994ee75 100644
--- a/src/v2/compiler/dependency_demand.dag
+++ b/src/v2/compiler/dependency_demand.dag
@@ -5,7 +5,7 @@ import v2.std.algebra { fold_list, length }
 import std.types { List }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
 import v2.std.integer { Int }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name { QualifiedName }
 
 // DERIVED DEPENDENCY DEMAND (DESIGN D13; the carrier gunbc.rung_drop
diff --git a/src/v2/compiler/dependency_demand_census.dag b/src/v2/compiler/dependency_demand_census.dag
index 34adcb481b4..ef655e37a56 100644
--- a/src/v2/compiler/dependency_demand_census.dag
+++ b/src/v2/compiler/dependency_demand_census.dag
@@ -45,7 +45,7 @@ import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.grammar { grammar_empty_node }
 import v2.std.integer { Int }
 import v2.std.node { Arrow, ArrowResourceRequirementsEdge, Atom, Authored, Bind, Branch, Cardinality, ComputationNode, Conj, CoreEdgeLabel, Disj, Edge, Instantiation, Loop, Match, Node, Positional, StructuralLabel, Symbol, Transform, TypeNode, Value, edge_is_core, label_sort_key, node_rebuild }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name { QualifiedName, declaration_reference_path_optional, lexical_reference_label_optional, parameter_reference_path_optional, qualified_name_snoc, qualified_name_to_dotted_string }
 import v2.std.symbol_index { SymbolIndex, symbol_index_declares_resource_at, symbol_index_lookup }
 import v2.std.text { String }
diff --git a/src/v2/compiler/effect_demand_floor_join.dag b/src/v2/compiler/effect_demand_floor_join.dag
index 2dea2b6dabc..5de1cce1be6 100644
--- a/src/v2/compiler/effect_demand_floor_join.dag
+++ b/src/v2/compiler/effect_demand_floor_join.dag
@@ -18,7 +18,7 @@ import v2.lens.module_graph {
 import v2.std.algebra { Cons, Empty, any, contains, fold_list, length, list_reverse }
 import v2.std.collection { Map, empty_map, map_insert }
 import v2.std.integer { Int }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.text { String }
 import v2.workflow.floor_discovery_row { FloorDiscoveryRow }
 import v2.workflow.floor_discovery_producer { discover_floor_corpus_rows_from_host_facts }
diff --git a/src/v2/compiler/fold_lowering.dag b/src/v2/compiler/fold_lowering.dag
index e0f50f2c87d..89452cc5f05 100644
--- a/src/v2/compiler/fold_lowering.dag
+++ b/src/v2/compiler/fold_lowering.dag
@@ -9,7 +9,7 @@ import v2.extdeps.languages.dag {
   parse_production_emitted_identity_optional
 }
 import v2.std.text { String }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/inferred_tree.dag b/src/v2/compiler/inferred_tree.dag
index acbeb830df9..cec3efd1b11 100644
--- a/src/v2/compiler/inferred_tree.dag
+++ b/src/v2/compiler/inferred_tree.dag
@@ -5,10 +5,10 @@ import v2.std.cardinality { TerminationProof }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
 import std.occurrence_identity { OccurrenceId, OccurrenceMinted, OccurrencePending, OccurrenceProjected, OccurrenceSynthetic }
 import std.algebra { list_snoc_item }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.constraints { CanonicalGrounding }
 import v2.std.node { Node }
-import v2.std.optional { Optional, optional_absent }
+import std.optional { Optional, optional_absent }
 import v2.std.witness { Witness }
 import std.algebra { PartialFunction }
 
diff --git a/src/v2/compiler/ingested_fixture_arrows.dag b/src/v2/compiler/ingested_fixture_arrows.dag
index 6479290d08a..734d506d920 100644
--- a/src/v2/compiler/ingested_fixture_arrows.dag
+++ b/src/v2/compiler/ingested_fixture_arrows.dag
@@ -2,7 +2,7 @@ module v2.compiler.ingested_fixture_arrows
 
 import v2.compiler.staged_front_end { front_end_run_outcome, run_front_end }
 import v2.compiler.resolve { ResolvedTree }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/compiler/materialization_carriers.dag b/src/v2/compiler/materialization_carriers.dag
index 27d0693f3b4..38aac4d32d6 100644
--- a/src/v2/compiler/materialization_carriers.dag
+++ b/src/v2/compiler/materialization_carriers.dag
@@ -41,7 +41,7 @@ import v2.std.diagnostic {
   diagnostics_singleton, invariant_port_locus,
 }
 import v2.std.node { Symbol }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 data v2_compiler_materialization_memo_gate_predicate_contract: Disposition = Terminal {
   reason: "Structural coproduct reader over std.realization.Materialization (materialization_allows_memo_store — Memoize => store permitted, Recompute/Share => refused) — closed by the three declared Materialization variants; .dag authority for parse_table_lookup/insert and cached_stage_governed; discriminating corpus: parse_table_memo_governed_witness_test.dag + compiler_materialization_witness_test.dag."
diff --git a/src/v2/compiler/native_loop.dag b/src/v2/compiler/native_loop.dag
index 475ba6ad45d..a04960a19ff 100644
--- a/src/v2/compiler/native_loop.dag
+++ b/src/v2/compiler/native_loop.dag
@@ -4,7 +4,7 @@ import std.algebra { FreeMonoid }
 import std.types { NonEmptyStr, String, List }
 import v2.std.compilers.target_model { TargetModel }
 import v2.std.node { Node }
-import v2.std.optional { Optional }
+import std.optional { Optional }
 import v2.std.diagnostic { NonEmptyDiagnostics }
 import gunbc.repository_census_observation { SourceRootIdentity }
 
diff --git a/src/v2/compiler/native_test_vocabulary.dag b/src/v2/compiler/native_test_vocabulary.dag
index 68e33f1dcf4..03d79363bef 100644
--- a/src/v2/compiler/native_test_vocabulary.dag
+++ b/src/v2/compiler/native_test_vocabulary.dag
@@ -16,7 +16,7 @@ import v2.std.lens_verdict { lens_verdict_diagnostics_located_chain_text }
 import v2.std.node { Symbol, symbol_lexeme }
 import v2.std.qualified_name { QualifiedName }
 import v2.std.text { String }
-import v2.std.optional { Optional }
+import std.optional { Optional }
 import v2.std.integer { Int }
 import v2.std.source_position { SourceByteColumn }
 import v2.std.collection { List }
diff --git a/src/v2/compiler/occurrence_role.dag b/src/v2/compiler/occurrence_role.dag
index 95020df00ab..2e6b189dcc9 100644
--- a/src/v2/compiler/occurrence_role.dag
+++ b/src/v2/compiler/occurrence_role.dag
@@ -42,7 +42,7 @@ import v2.std.compilers.sugar { sugar_sequence_pair_optional }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.grammar { GrammarExpr, GrammarExprFold, GrammarRoot, node_atom_identity_optional, StampBinding, StampClass, StampLexeme, fold_grammar_expr }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 
 // WHICH AUTHORED NAMES DECLARE, AND WHICH NAME SOMETHING THE MODULE SCOPE DOES NOT HOLD (XL-2
 // prerequisite gunbc.compiler_frontend_program_status LoweringOccurrenceProjection, tracked by
diff --git a/src/v2/compiler/parse_diagnostic.dag b/src/v2/compiler/parse_diagnostic.dag
index 53b8c8cc375..da5e52d6d99 100644
--- a/src/v2/compiler/parse_diagnostic.dag
+++ b/src/v2/compiler/parse_diagnostic.dag
@@ -26,7 +26,7 @@ import v2.std.grammar_choice_ambiguity {
   GrammarChoiceAmbiguityRow,
   NonEmptyGrammarChoiceAmbiguityRows
 }
-import v2.std.optional { Optional, Present, optional_absent, optional_present, Absent }
+import std.optional { Optional, Present, optional_absent, optional_present, Absent }
 
 // ParseDiagnosticEvidence is parse-stage evidence orthogonal to the universal Diagnostic carrier. Grammar-choice overlap rows live here — never on Correction, Locus, or Diagnostic itself.
 type ParseDiagnosticEvidence
diff --git a/src/v2/compiler/program_partition.dag b/src/v2/compiler/program_partition.dag
index a823ca2d53f..d8797f2b5ec 100644
--- a/src/v2/compiler/program_partition.dag
+++ b/src/v2/compiler/program_partition.dag
@@ -28,7 +28,7 @@ import v2.std.algebra { any, fold_list, FreeMonoid }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/reference_closure.dag b/src/v2/compiler/reference_closure.dag
index 1d23c79a117..ae423f5fc71 100644
--- a/src/v2/compiler/reference_closure.dag
+++ b/src/v2/compiler/reference_closure.dag
@@ -13,7 +13,7 @@ import v2.std.diagnostic {
   outcome_rejected
 }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name {
   QualifiedName,
   declaration_reference_path_optional,
diff --git a/src/v2/compiler/reference_conservation.dag b/src/v2/compiler/reference_conservation.dag
index 9d002a4dfce..729c6f0708b 100644
--- a/src/v2/compiler/reference_conservation.dag
+++ b/src/v2/compiler/reference_conservation.dag
@@ -43,7 +43,7 @@ import v2.std.grammar { node_atom_identity_optional }
 import v2.compiler.normalize { normalize }
 import v2.std.language_model { LanguageModel }
 import v2.std.node { Atom, Authored, StructuralLabel, Node, Positional, Symbol, TypeNode, symbol_lexeme }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.lens_verdict { lens_verdict_diagnostic_located_text_in_spans }
 import v2.std.provenance { SpanIndex, span_index_empty, span_index_resolve_textual_locus }
 import v2.std.text { String }
diff --git a/src/v2/compiler/reference_conservation_admission.dag b/src/v2/compiler/reference_conservation_admission.dag
index f20ba35817d..cd1ddf8acd8 100644
--- a/src/v2/compiler/reference_conservation_admission.dag
+++ b/src/v2/compiler/reference_conservation_admission.dag
@@ -37,7 +37,7 @@ import v2.std.diagnostic {
 }
 import v2.std.integer { Int }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name { qualified_name_init, qualified_name_to_dotted_string }
 import v2.std.text { String }
 import std.algebra { Cons, Empty, FreeMonoid, list_snoc_item }
diff --git a/src/v2/compiler/reference_conservation_census.dag b/src/v2/compiler/reference_conservation_census.dag
index 0ab056f8dd5..595475a43f5 100644
--- a/src/v2/compiler/reference_conservation_census.dag
+++ b/src/v2/compiler/reference_conservation_census.dag
@@ -45,7 +45,7 @@ import v2.compiler.reference_conservation_admission {
 import v2.extdeps.languages.dag { dag_language_model }
 import v2.std.algebra { fold_list, length }
 import v2.std.collection { empty_map, map_insert, map_lookup }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.bytes { bytes_octets, utf8_encode_bytes }
 import gunbc.namespace_step0_subject_collector { Step0SubjectCollected, Step0SubjectCollectionRefused, collect_step0_subject_vector_at }
 import v2.std.integer { integer_int_to_decimal_string }
diff --git a/src/v2/compiler/reference_site_collector.dag b/src/v2/compiler/reference_site_collector.dag
index 37b084dfefd..86ded5372e8 100644
--- a/src/v2/compiler/reference_site_collector.dag
+++ b/src/v2/compiler/reference_site_collector.dag
@@ -18,7 +18,7 @@ import v2.std.node {
   EdgeLabel,
   StructuralLabel,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name {
   QualifiedName,
   qualified_name_from_node,
diff --git a/src/v2/compiler/resolution_provenance.dag b/src/v2/compiler/resolution_provenance.dag
index 415b572419e..de6080f1f33 100644
--- a/src/v2/compiler/resolution_provenance.dag
+++ b/src/v2/compiler/resolution_provenance.dag
@@ -14,7 +14,7 @@ import v2.std.algebra {
 }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.node { Node, Symbol, EdgeLabel, label_sort_key }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/self_host/ancestry.dag b/src/v2/compiler/self_host/ancestry.dag
index 365f9606b2e..030d9f32b73 100644
--- a/src/v2/compiler/self_host/ancestry.dag
+++ b/src/v2/compiler/self_host/ancestry.dag
@@ -4,7 +4,7 @@ import std.content_hash { Sha512Digest, content_hash_eq_sha512 }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
 import std.types { NonEmptyStr }
 import v2.std.node { Hash, Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.text { String }
 import v2.compiler.self_host.emitter_producer_provenance {
   EmitterProducer,
diff --git a/src/v2/compiler/self_host/candidate_generation.dag b/src/v2/compiler/self_host/candidate_generation.dag
index 7e8de4d6ffa..091d9711d48 100644
--- a/src/v2/compiler/self_host/candidate_generation.dag
+++ b/src/v2/compiler/self_host/candidate_generation.dag
@@ -39,7 +39,7 @@ import v2.std.diagnostic {
   invariant_port_locus
 }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Present, optional_absent, optional_present }
+import std.optional { Absent, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import v2.compiler.refinement_discharge { infer_and_discharge }
 
diff --git a/src/v2/compiler/self_host/closure_emission.dag b/src/v2/compiler/self_host/closure_emission.dag
index 34a79d95646..1f14d07ab0d 100644
--- a/src/v2/compiler/self_host/closure_emission.dag
+++ b/src/v2/compiler/self_host/closure_emission.dag
@@ -77,7 +77,7 @@ import v2.std.resolution_policy { default_name_resolution_policy }
 import v2.std.symbol_index { SymbolIndex, empty_symbol_index }
 import v2.std.grammar { ParseTree }
 import v2.std.integer { Int }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.text { String }
 import v2.compiler.refinement_discharge { infer_and_discharge }
 
diff --git a/src/v2/compiler/self_host/direct_rust_door_fixture.dag b/src/v2/compiler/self_host/direct_rust_door_fixture.dag
index 530e7d6a9ac..5723994bee4 100644
--- a/src/v2/compiler/self_host/direct_rust_door_fixture.dag
+++ b/src/v2/compiler/self_host/direct_rust_door_fixture.dag
@@ -1,5 +1,5 @@
 module v2.compiler.self_host.direct_rust_door_fixture
-import v2.std.optional { optional_absent }
+import std.optional { optional_absent }
 
 import v2.compiler.refinement_discharge { infer_and_discharge }
 import extdeps.communication.medium { Lossless, Medium }
@@ -46,7 +46,7 @@ import v2.std.diagnostic {
   Unavailable,
   node_locus
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   optional_absent,
   optional_present
diff --git a/src/v2/compiler/self_host/emitter_producer_provenance.dag b/src/v2/compiler/self_host/emitter_producer_provenance.dag
index 5aa6a3ff0e1..5acf3748e87 100644
--- a/src/v2/compiler/self_host/emitter_producer_provenance.dag
+++ b/src/v2/compiler/self_host/emitter_producer_provenance.dag
@@ -5,7 +5,7 @@ import std.dissolution { DissolutionCondition, unbound_dissolution }
 import std.types { NonEmptyStr, List }
 import v2.std.algebra { any, fold_list, length }
 import v2.std.node { Hash, Symbol, combine_hash, symbol_identity_digest }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/self_host/fixture_synthetic_emission.dag b/src/v2/compiler/self_host/fixture_synthetic_emission.dag
index 1cdcf51445e..89da03148f2 100644
--- a/src/v2/compiler/self_host/fixture_synthetic_emission.dag
+++ b/src/v2/compiler/self_host/fixture_synthetic_emission.dag
@@ -21,7 +21,7 @@ import v2.std.diagnostic {
   outcome_accepted
 }
 import v2.std.node { Hash, Node, combine_hash, symbol_identity_digest }
-import v2.std.optional { Absent, Present, optional_absent, optional_present }
+import std.optional { Absent, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 data fixture_synthetic_emission_note: String = "Parallel fixture-scoped emission authority (wise-ram-22 disposition PR1 containment): SyntheticEmittedArtifact / FixtureBehaviorReceipt carry FixtureEmissionQualification only — no constructor into ProducerEmissionReceipt or production EmissionQualification."
diff --git a/src/v2/compiler/self_host/frontier_probe.dag b/src/v2/compiler/self_host/frontier_probe.dag
index cf4358346db..de7282c9366 100644
--- a/src/v2/compiler/self_host/frontier_probe.dag
+++ b/src/v2/compiler/self_host/frontier_probe.dag
@@ -107,7 +107,7 @@ import v2.std.diagnostic {
   invariant_port_locus
 }
 import v2.std.qualified_name { QualifiedName }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 data frontier_probe_closure_duplicate_ref_reason: Symbol = ^frontier_probe_closure_duplicate_ref
diff --git a/src/v2/compiler/self_host/frontier_probe_assemble_detail.dag b/src/v2/compiler/self_host/frontier_probe_assemble_detail.dag
index 5478a373b3e..ddd8027c298 100644
--- a/src/v2/compiler/self_host/frontier_probe_assemble_detail.dag
+++ b/src/v2/compiler/self_host/frontier_probe_assemble_detail.dag
@@ -38,7 +38,7 @@ import v2.compiler.self_host.frontier_probe_types {
   ProbeStageAssemble
 }
 import v2.std.diagnostic { Diagnostic, NonEmptyDiagnostics, diagnostics_fatal, diagnostics_fatal_reason }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name { QualifiedName }
 import v2.std.text { String }
 
diff --git a/src/v2/compiler/self_host/frontier_probe_types.dag b/src/v2/compiler/self_host/frontier_probe_types.dag
index 4cf50340cbd..3446f0755e5 100644
--- a/src/v2/compiler/self_host/frontier_probe_types.dag
+++ b/src/v2/compiler/self_host/frontier_probe_types.dag
@@ -39,7 +39,7 @@ import v2.std.grammar_choice_ambiguity {
 import v2.std.integer { Int }
 import v2.std.diagnostic { DeclarationLocus, Extent, InvariantPortLocus, Locus, NodeLocus, SourcePortLocus, Textual }
 import v2.std.node { Symbol, symbol_lexeme }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.qualified_name { QualifiedName, qualified_name_to_dotted_string }
 import v2.std.text { String }
 
diff --git a/src/v2/compiler/self_host/native_agreement_support.dag b/src/v2/compiler/self_host/native_agreement_support.dag
index 5a11867cb92..563d7a25494 100644
--- a/src/v2/compiler/self_host/native_agreement_support.dag
+++ b/src/v2/compiler/self_host/native_agreement_support.dag
@@ -1,7 +1,7 @@
 module v2.compiler.self_host.native_agreement_support
 
 import v2.compiler.eval { TestClaimRun }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent
diff --git a/src/v2/compiler/self_host/promotion_admission.dag b/src/v2/compiler/self_host/promotion_admission.dag
index 6b6a385904a..d622ebebc9f 100644
--- a/src/v2/compiler/self_host/promotion_admission.dag
+++ b/src/v2/compiler/self_host/promotion_admission.dag
@@ -30,7 +30,7 @@ import v2.std.algebra { fold_list, length }
 import std.algebra { freemonoid_empty, list_snoc_item }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
 import v2.std.integer { Int }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.node { Hash, Symbol }
 import v2.std.text { String }
 
diff --git a/src/v2/compiler/self_host/seed_emitter_behavioral_wet_module_bindings.dag b/src/v2/compiler/self_host/seed_emitter_behavioral_wet_module_bindings.dag
index 5ae84c79983..2fa43609f7d 100644
--- a/src/v2/compiler/self_host/seed_emitter_behavioral_wet_module_bindings.dag
+++ b/src/v2/compiler/self_host/seed_emitter_behavioral_wet_module_bindings.dag
@@ -1,7 +1,7 @@
 module v2.compiler.self_host.seed_emitter_behavioral_wet_module_bindings
 
 import std.types { List }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/self_host/v2_emitter_direct_rust_door_contract.dag b/src/v2/compiler/self_host/v2_emitter_direct_rust_door_contract.dag
index d86837499f1..c5c7bdff5ef 100644
--- a/src/v2/compiler/self_host/v2_emitter_direct_rust_door_contract.dag
+++ b/src/v2/compiler/self_host/v2_emitter_direct_rust_door_contract.dag
@@ -47,7 +47,7 @@ import v2.std.node {
   Symbol,
   TypeNode,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 // THE CLOSING CONDITION for roadmap node v2-emitter-direct-rust-door.
diff --git a/src/v2/compiler/self_host/wet_receipt_enrollment.dag b/src/v2/compiler/self_host/wet_receipt_enrollment.dag
index 6c1a1011538..e0943b3a3c9 100644
--- a/src/v2/compiler/self_host/wet_receipt_enrollment.dag
+++ b/src/v2/compiler/self_host/wet_receipt_enrollment.dag
@@ -10,7 +10,7 @@ import v2.compiler.self_host.seed_emitter_behavioral_wet_module_bindings {
   find_wet_receipt_binding
 }
 import v2.std.algebra { length }
-import v2.std.optional {
+import std.optional {
   Absent,
   Present
 }
diff --git a/src/v2/compiler/self_host/wet_receipt_route_standing.dag b/src/v2/compiler/self_host/wet_receipt_route_standing.dag
index 250ea728755..6c280d34870 100644
--- a/src/v2/compiler/self_host/wet_receipt_route_standing.dag
+++ b/src/v2/compiler/self_host/wet_receipt_route_standing.dag
@@ -19,7 +19,7 @@ import v2.compiler.self_host.seed_emitter_behavioral_wet_known_red_entries {
 import tools.self_host_logic_behavioral_transport { slb_receipt_pass_marker }
 import std.realization_schedule { ScheduleWitnessEntry }
 import v2.std.algebra { fold_list, length }
-import v2.std.optional { Optional, Absent, Present, optional_absent, optional_present }
+import std.optional { Optional, Absent, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 // ROW-GRAIN ROUTE STANDING FOR THE WET SELF-HOST BEHAVIORAL RECEIPTS, and the grain is the whole
diff --git a/src/v2/compiler/service_realization.dag b/src/v2/compiler/service_realization.dag
index a62af81e854..953610851ff 100644
--- a/src/v2/compiler/service_realization.dag
+++ b/src/v2/compiler/service_realization.dag
@@ -25,7 +25,7 @@ import v2.std.service_realization_labels {
 }
 import std.types { List }
 import v2.std.diagnostic { Accepted, Diagnostic, ExternalContractUnknown, Rejected, Unavailable, node_locus }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import v2.std.node {
   Ambiguous,
diff --git a/src/v2/compiler/source_authority.dag b/src/v2/compiler/source_authority.dag
index df5af23f855..4f449781656 100644
--- a/src/v2/compiler/source_authority.dag
+++ b/src/v2/compiler/source_authority.dag
@@ -48,7 +48,7 @@ import v2.std.node { Node, Symbol, canonicalize_node_strip_provenance, symbol_in
 import v2.std.qualified_name { QualifiedName, qualified_name_to_dotted_string }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import std.disposition { Disposition, RealizationDispatch, Scaffold }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/staged_front_end.dag b/src/v2/compiler/staged_front_end.dag
index 32da5634778..2422be5ba49 100644
--- a/src/v2/compiler/staged_front_end.dag
+++ b/src/v2/compiler/staged_front_end.dag
@@ -9,7 +9,7 @@ import v2.extdeps.languages.dag { dag_language_model }
 import std.algebra { list_snoc_item }
 import v2.std.compilers.lexing { TokenStream, token_stream_remaining_count }
 import v2.std.language_model { LanguageModel }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import v2.compiler.normalized_tree { NormalizedTree }
 import v2.std.diagnostic {
diff --git a/src/v2/compiler/symbol_index_fill.dag b/src/v2/compiler/symbol_index_fill.dag
index ace884568ac..bb6c5edc684 100644
--- a/src/v2/compiler/symbol_index_fill.dag
+++ b/src/v2/compiler/symbol_index_fill.dag
@@ -11,7 +11,7 @@ import v2.std.collection {
   map_insert
 }
 import v2.std.node_query { binder_node_parts }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/target_serialize.dag b/src/v2/compiler/target_serialize.dag
index b22fabe1848..08db8c2d549 100644
--- a/src/v2/compiler/target_serialize.dag
+++ b/src/v2/compiler/target_serialize.dag
@@ -146,7 +146,7 @@ import v2.std.collection {
   list_at_optional,
   map_get
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/trait_derive_completeness.dag b/src/v2/compiler/trait_derive_completeness.dag
index b58483ad3c9..4598745068d 100644
--- a/src/v2/compiler/trait_derive_completeness.dag
+++ b/src/v2/compiler/trait_derive_completeness.dag
@@ -38,7 +38,7 @@ import v2.std.algebra {
   Cons,
   Empty
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/compiler/wrap_decision.dag b/src/v2/compiler/wrap_decision.dag
index d5144fe20a6..fa8f17e88bf 100644
--- a/src/v2/compiler/wrap_decision.dag
+++ b/src/v2/compiler/wrap_decision.dag
@@ -17,7 +17,7 @@ import std.algebra { Empty }
 import v2.std.collection {
   Symbol
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/extdeps/formats/icestorm_pcf.dag b/src/v2/extdeps/formats/icestorm_pcf.dag
index f5d79a1536c..1c2b696f921 100644
--- a/src/v2/extdeps/formats/icestorm_pcf.dag
+++ b/src/v2/extdeps/formats/icestorm_pcf.dag
@@ -2,7 +2,7 @@ module v2.extdeps.formats.icestorm_pcf
 
 import std.types { List }
 import std.nat { Nat }
-import v2.std.optional { Optional, Absent, Present, optional_absent, optional_present }
+import std.optional { Optional, Absent, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
 import v2.std.algebra { fold_list }
diff --git a/src/v2/extdeps/formats/spice.dag b/src/v2/extdeps/formats/spice.dag
index d197487d681..f16cd4fe32c 100644
--- a/src/v2/extdeps/formats/spice.dag
+++ b/src/v2/extdeps/formats/spice.dag
@@ -3,7 +3,7 @@ module v2.extdeps.formats.spice
 import std.types { List }
 import std.algebra { Cons, Empty, list_append, list_snoc_item }
 import v2.std.algebra { fold_list }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/extdeps/formats/spice_passive_projection.dag b/src/v2/extdeps/formats/spice_passive_projection.dag
index d3144d2f973..cee8cd87a15 100644
--- a/src/v2/extdeps/formats/spice_passive_projection.dag
+++ b/src/v2/extdeps/formats/spice_passive_projection.dag
@@ -1,6 +1,6 @@
 module v2.extdeps.formats.spice_passive_projection
 
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present
diff --git a/src/v2/extdeps/formats/sql.dag b/src/v2/extdeps/formats/sql.dag
index 5ac8f3e2bb1..9b4df20d5ea 100644
--- a/src/v2/extdeps/formats/sql.dag
+++ b/src/v2/extdeps/formats/sql.dag
@@ -11,7 +11,7 @@ import v2.std.collection {
   empty_map,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
@@ -488,7 +488,7 @@ fn sql_serialize_identifier_list(ids: List<SqlIdentifier>) -> String {
 fn sql_serialize_primary_key_clause(pk: Optional<List<SqlIdentifier>>) -> String {
   match pk {
     Absent => ""
-    v2.std.optional.Present { value: cols } =>
+    std.optional.Present { value: cols } =>
       concat(
         ", PRIMARY KEY (",
         concat(
diff --git a/src/v2/extdeps/formats/sql_create_table_fold.dag b/src/v2/extdeps/formats/sql_create_table_fold.dag
index feb0654588e..995dba8f6e1 100644
--- a/src/v2/extdeps/formats/sql_create_table_fold.dag
+++ b/src/v2/extdeps/formats/sql_create_table_fold.dag
@@ -32,7 +32,7 @@ import v2.std.collection {
   list_nth,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/extdeps/github/gha_fold_pilot_emit.dag b/src/v2/extdeps/github/gha_fold_pilot_emit.dag
index 0ca30637318..60498ad43d5 100644
--- a/src/v2/extdeps/github/gha_fold_pilot_emit.dag
+++ b/src/v2/extdeps/github/gha_fold_pilot_emit.dag
@@ -10,7 +10,7 @@ import extdeps.github.actions {
   UsesStep
 }
 import v2.std.algebra { for_all }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/extdeps/languages/c.dag b/src/v2/extdeps/languages/c.dag
index a3fb70164d5..830381e6b02 100644
--- a/src/v2/extdeps/languages/c.dag
+++ b/src/v2/extdeps/languages/c.dag
@@ -34,7 +34,7 @@ import v2.std.collection {
   empty_map,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/extdeps/languages/dag.dag b/src/v2/extdeps/languages/dag.dag
index 1cc1ad01722..e4b4bcb6d73 100644
--- a/src/v2/extdeps/languages/dag.dag
+++ b/src/v2/extdeps/languages/dag.dag
@@ -15,7 +15,7 @@ import v2.std.collection {
   map_insert,
   map_lookup
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/extdeps/languages/ecmascript.dag b/src/v2/extdeps/languages/ecmascript.dag
index 8a98e573370..4ed1f2e5368 100644
--- a/src/v2/extdeps/languages/ecmascript.dag
+++ b/src/v2/extdeps/languages/ecmascript.dag
@@ -34,7 +34,7 @@ import v2.std.grammar {
   formal_production_to_node,
   grammar_relation_tokens_node
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/extdeps/languages/java.dag b/src/v2/extdeps/languages/java.dag
index 7fb2f806773..c2932a9a652 100644
--- a/src/v2/extdeps/languages/java.dag
+++ b/src/v2/extdeps/languages/java.dag
@@ -52,7 +52,7 @@ import v2.std.collection {
   empty_map,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Present,
   Optional
diff --git a/src/v2/extdeps/languages/kotlin.dag b/src/v2/extdeps/languages/kotlin.dag
index 231ae7eb49d..694f05b21b9 100644
--- a/src/v2/extdeps/languages/kotlin.dag
+++ b/src/v2/extdeps/languages/kotlin.dag
@@ -61,7 +61,7 @@ import v2.std.collection {
   empty_map,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Present,
   Optional
diff --git a/src/v2/extdeps/languages/python.dag b/src/v2/extdeps/languages/python.dag
index 06a2bbf49bb..e0bdf2b4756 100644
--- a/src/v2/extdeps/languages/python.dag
+++ b/src/v2/extdeps/languages/python.dag
@@ -34,7 +34,7 @@ import v2.std.grammar {
   formal_production_to_node,
   grammar_relation_tokens_node
 }
-import v2.std.optional {
+import std.optional {
   Optional
 }
 import v2.std.compilers.lexing {
diff --git a/src/v2/extdeps/languages/rust.dag b/src/v2/extdeps/languages/rust.dag
index 20164b92616..231a33e6917 100644
--- a/src/v2/extdeps/languages/rust.dag
+++ b/src/v2/extdeps/languages/rust.dag
@@ -95,7 +95,7 @@ import v2.std.collection {
   map_insert,
   map_lookup
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/extdeps/languages/swift.dag b/src/v2/extdeps/languages/swift.dag
index 59486971eeb..ec361e8e9f8 100644
--- a/src/v2/extdeps/languages/swift.dag
+++ b/src/v2/extdeps/languages/swift.dag
@@ -63,7 +63,7 @@ import v2.std.collection {
   empty_map,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Present,
   Optional
diff --git a/src/v2/extdeps/languages/swift/rows.dag b/src/v2/extdeps/languages/swift/rows.dag
index c2da8656785..0d3d831fd3c 100644
--- a/src/v2/extdeps/languages/swift/rows.dag
+++ b/src/v2/extdeps/languages/swift/rows.dag
@@ -2,7 +2,7 @@ module v2.extdeps.languages.swift.rows
 
 import std.types { String, List, Bool, Int }
 import std.occurrence_identity { OccurrenceSynthetic }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.algebra { list_append, length }
 import extdeps.numeric.base16 { int_to_upper_hex }
 import extdeps.external_authority { ExternalAuthority }
diff --git a/src/v2/extdeps/languages/swift/syntax.dag b/src/v2/extdeps/languages/swift/syntax.dag
index 1b141743496..0cdacfa3579 100644
--- a/src/v2/extdeps/languages/swift/syntax.dag
+++ b/src/v2/extdeps/languages/swift/syntax.dag
@@ -1,7 +1,7 @@
 module v2.extdeps.languages.swift.syntax
 
 import std.types { String, List, Bool, Int }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
diff --git a/src/v2/extdeps/languages/typescript.dag b/src/v2/extdeps/languages/typescript.dag
index 2d1cd7af2c5..dd5c1555131 100644
--- a/src/v2/extdeps/languages/typescript.dag
+++ b/src/v2/extdeps/languages/typescript.dag
@@ -59,7 +59,7 @@ import v2.std.collection {
   empty_map,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/extdeps/languages/wasm.dag b/src/v2/extdeps/languages/wasm.dag
index b27bdec8d50..e666dfe303e 100644
--- a/src/v2/extdeps/languages/wasm.dag
+++ b/src/v2/extdeps/languages/wasm.dag
@@ -58,7 +58,7 @@ import v2.std.collection {
   empty_map,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Present,
   Optional
diff --git a/src/v2/lens/complexity_accumulator_copy.dag b/src/v2/lens/complexity_accumulator_copy.dag
index be93ebe9383..068df77b88e 100644
--- a/src/v2/lens/complexity_accumulator_copy.dag
+++ b/src/v2/lens/complexity_accumulator_copy.dag
@@ -13,7 +13,7 @@ import v2.lens.cost.copied_port_citations { copied_port_index_of }
 import v2.std.collection {
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/lens/complexity_accumulator_copy/analyze.dag b/src/v2/lens/complexity_accumulator_copy/analyze.dag
index ba0513b2c12..9fed8cbf087 100644
--- a/src/v2/lens/complexity_accumulator_copy/analyze.dag
+++ b/src/v2/lens/complexity_accumulator_copy/analyze.dag
@@ -1,7 +1,7 @@
 module v2.lens.complexity_accumulator_copy.analyze
 
 import std.types { List }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.integer { Int }
 import v2.std.node { Node, Symbol }
 import v2.extdeps.languages.dag { ParseSubtreeAbsent }
diff --git a/src/v2/lens/complexity_accumulator_copy/corpus_gate.dag b/src/v2/lens/complexity_accumulator_copy/corpus_gate.dag
index d858fe4d8c1..0f7223738a7 100644
--- a/src/v2/lens/complexity_accumulator_copy/corpus_gate.dag
+++ b/src/v2/lens/complexity_accumulator_copy/corpus_gate.dag
@@ -21,7 +21,7 @@ import v2.lens.module_graph { ModuleDeclarationFact, module_declaration_facts_li
 import v2.std.algebra { list_reverse }
 import v2.std.integer { Int }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 // THE POPULATION IS DISCOVERED, NOT AUTHORED. The roster gate beside this module asks the same
diff --git a/src/v2/lens/cost/copied_port_citations.dag b/src/v2/lens/cost/copied_port_citations.dag
index 0ace68c8d8d..a1820f52ce6 100644
--- a/src/v2/lens/cost/copied_port_citations.dag
+++ b/src/v2/lens/cost/copied_port_citations.dag
@@ -14,7 +14,7 @@ import v2.lens.cost.copied_port_derivation {
 }
 import v2.std.algebra { CopiedPortFact, fold_list }
 import v2.std.collection { optional_absent, optional_present }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/lens/cost/copied_port_derivation.dag b/src/v2/lens/cost/copied_port_derivation.dag
index 4023c2c597f..63229db345d 100644
--- a/src/v2/lens/cost/copied_port_derivation.dag
+++ b/src/v2/lens/cost/copied_port_derivation.dag
@@ -16,7 +16,7 @@ import v2.lens.cost {
   PolyLogCost,
   PolynomialCost
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/lens/cost/valuation.dag b/src/v2/lens/cost/valuation.dag
index 0f1a70dc30f..a7484d8b0e0 100644
--- a/src/v2/lens/cost/valuation.dag
+++ b/src/v2/lens/cost/valuation.dag
@@ -26,7 +26,7 @@ import v2.lens.cost.expr {
 import v2.std.algebra { fold_list, non_empty_append, non_empty_singleton }
 import v2.std.diagnostic { Locus, textual_whole_file_locus }
 import std.nat { Nat, Succ, Zero, nat_add, nat_cata, nat_mul, nat_max }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 
 // The subject of this module is SEMANTIC work, not hardware time: a CostExpr together with a
 // COMPLETE valuation of its size variables yields how much modelled work the expression denotes.
diff --git a/src/v2/lens/determinism.dag b/src/v2/lens/determinism.dag
index 5b67739b9b1..39496cecb64 100644
--- a/src/v2/lens/determinism.dag
+++ b/src/v2/lens/determinism.dag
@@ -19,7 +19,7 @@ import std.primitive_identity {
 import std.determinism { Determinism, Deterministic, NonDeterministic, determinism_compose }
 import std.algebra { Cons, Empty }
 import v2.std.determinism { DeterminismFact }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.diagnostic { Diagnostic, ExternalContractUnknown, NonEmptyDiagnostics, Outcome, Rejected, Unavailable, node_locus, invariant_port_locus, outcome_accepted }
 import v2.std.node { Edge, Node, NodeFold, Symbol, fold_node, symbol_intern_lexeme, symbol_lexeme }
 import v2.std.compilers.body_lowering {
diff --git a/src/v2/lens/effect.dag b/src/v2/lens/effect.dag
index 6ee238f9fd7..b4e913257c8 100644
--- a/src/v2/lens/effect.dag
+++ b/src/v2/lens/effect.dag
@@ -10,7 +10,7 @@ import std.algebra { list_snoc_item }
 import v2.std.collection {
   optional_present_witness
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   optional_absent,
   optional_prefer_first_present,
diff --git a/src/v2/lens/idempotency.dag b/src/v2/lens/idempotency.dag
index 375b9127842..1aedc6862ce 100644
--- a/src/v2/lens/idempotency.dag
+++ b/src/v2/lens/idempotency.dag
@@ -15,7 +15,7 @@ import std.algebra { list_snoc_item }
 import v2.std.collection {
   optional_present_witness
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   optional_absent,
   optional_prefer_first_present,
diff --git a/src/v2/lens/identity_captured_navigation/analyze.dag b/src/v2/lens/identity_captured_navigation/analyze.dag
index 9153bc2f70e..8506c352cc2 100644
--- a/src/v2/lens/identity_captured_navigation/analyze.dag
+++ b/src/v2/lens/identity_captured_navigation/analyze.dag
@@ -9,7 +9,7 @@ import v2.std.node_query { find_named_child }
 import v2.std.collection { list_at_optional }
 import v2.std.algebra { list_reverse }
 import v2.std.grammar { node_atom_identity_optional }
-import v2.std.optional { Optional }
+import std.optional { Optional }
 
 fn named_child_optional(cap: Node, name: Symbol) -> Optional<Node> {
   match find_named_child(root: cap, name: name) {
diff --git a/src/v2/lens/lifecycle_carrier.dag b/src/v2/lens/lifecycle_carrier.dag
index 1553e38459d..230468660b2 100644
--- a/src/v2/lens/lifecycle_carrier.dag
+++ b/src/v2/lens/lifecycle_carrier.dag
@@ -25,7 +25,7 @@ import v2.std.node {
   StructuralLabel,
 }
 import v2.std.node_query { edge_field_type_name, member_edge_type_node, member_not_a_binder_diagnostic }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/lens/machine_shape.dag b/src/v2/lens/machine_shape.dag
index 4fd2855a9a8..50c50b553a9 100644
--- a/src/v2/lens/machine_shape.dag
+++ b/src/v2/lens/machine_shape.dag
@@ -7,7 +7,7 @@ import v2.extdeps.languages.dag {
   parse_production_emitted_identity_optional,
   qualified_name_from_module_node
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/lens/mandatory_tag.dag b/src/v2/lens/mandatory_tag.dag
index 61bfbfd210f..39a71909c61 100644
--- a/src/v2/lens/mandatory_tag.dag
+++ b/src/v2/lens/mandatory_tag.dag
@@ -7,7 +7,7 @@ import std.decl_ref { decl_ref }
 import std.algebra { Cons, Empty }
 import v2.std.algebra { length }
 import v2.std.integer { Int }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/lens/manufactured_dependency_census.dag b/src/v2/lens/manufactured_dependency_census.dag
index b463f11fcfb..2f33272b25d 100644
--- a/src/v2/lens/manufactured_dependency_census.dag
+++ b/src/v2/lens/manufactured_dependency_census.dag
@@ -7,7 +7,7 @@ import std.algebra { Cons, Empty, FreeMonoid, list_snoc_item }
 import std.process { ExitSuccess, ProcessExit, exit_failure }
 import v2.std.algebra { contains, fold_list, length, list_reverse }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String, string_eq }
 import v2.lens.module_graph {
   ImportResolutionFact,
diff --git a/src/v2/lens/module_graph.dag b/src/v2/lens/module_graph.dag
index 245ef1590a1..238f781bd8d 100644
--- a/src/v2/lens/module_graph.dag
+++ b/src/v2/lens/module_graph.dag
@@ -15,7 +15,7 @@ import v2.std.collection {
   map_get,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/lens/module_impact_query.dag b/src/v2/lens/module_impact_query.dag
index 3538e68f2e7..91e7d651002 100644
--- a/src/v2/lens/module_impact_query.dag
+++ b/src/v2/lens/module_impact_query.dag
@@ -9,7 +9,7 @@ import v2.std.algebra {
 }
 import std.algebra { Cons, list_snoc_item }
 import v2.std.collection { Map, empty_map, map_insert }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 import v2.std.text { String, string_eq }
 import v2.lens.common.construction_justification {
   ConstructionJustification,
diff --git a/src/v2/lens/parallelism.dag b/src/v2/lens/parallelism.dag
index e08c634d792..e37f8b4d66f 100644
--- a/src/v2/lens/parallelism.dag
+++ b/src/v2/lens/parallelism.dag
@@ -20,7 +20,7 @@ import std.algebra { list_snoc_item }
 import v2.std.collection {
   optional_present_witness
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   optional_absent,
   optional_prefer_first_present,
diff --git a/src/v2/lens/reference_derived_residency_reading.dag b/src/v2/lens/reference_derived_residency_reading.dag
index 9dd4365a5f5..8f6fb06ca19 100644
--- a/src/v2/lens/reference_derived_residency_reading.dag
+++ b/src/v2/lens/reference_derived_residency_reading.dag
@@ -19,7 +19,7 @@ import gunbc.namespace_reference_derived_residency_qualification {
 import std.decl_ref { DeclarationRef }
 import v2.std.algebra { length }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.node_query { member_edge_type_node }
 import v2.std.node {
   Arrow,
diff --git a/src/v2/lens/schedule_lens.dag b/src/v2/lens/schedule_lens.dag
index 8ffdc7fa9e8..f75d26f140a 100644
--- a/src/v2/lens/schedule_lens.dag
+++ b/src/v2/lens/schedule_lens.dag
@@ -25,7 +25,7 @@ import v2.std.lens_verdict {
   lens_verdict_module_file,
 }
 import v2.std.node { Symbol, symbol_intern_lexeme }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 type ScheduleLensViolation
diff --git a/src/v2/lens/text_string_importer_census.dag b/src/v2/lens/text_string_importer_census.dag
index b23569737ab..1e835bd51ed 100644
--- a/src/v2/lens/text_string_importer_census.dag
+++ b/src/v2/lens/text_string_importer_census.dag
@@ -24,12 +24,12 @@ import std.dissolution { DissolutionCondition, unbound_dissolution }
 import v2.lens.module_graph { ImportResolutionFact, ModuleDeclarationFact, import_resolution_facts_live, reference_derived_import_resolution_facts_live, module_declaration_facts_live }
 import v2.std.node { Node, Atom, TypeNode, symbol_lexeme }
 import v2.std.provenance { SpanIndex, span_index_empty, node_occurrence_id_optional, span_index_textual_locus_optional }
-import v2.std.optional { Optional }
+import std.optional { Optional }
 import v2.std.diagnostic { Accepted, Rejected, Textual, ByteRange, WholeFile }
 import v2.std.algebra { contains, fold_list, length, list_reverse }
 import v2.std.integer { Int, integer_int_to_decimal_string }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.algebra { Cons, Empty, FreeMonoid }
 import v2.std.source_position { source_newline_byte_offsets }
 import std.process { ExitSuccess, ProcessExit, exit_failure }
diff --git a/src/v2/lens/undecidable_verdict_collapse.dag b/src/v2/lens/undecidable_verdict_collapse.dag
index 06866c536bf..feb75db657d 100644
--- a/src/v2/lens/undecidable_verdict_collapse.dag
+++ b/src/v2/lens/undecidable_verdict_collapse.dag
@@ -18,7 +18,7 @@ import v2.extdeps.languages.dag {
 import std.algebra { Cons, Empty }
 import v2.std.algebra { fold_list, list_tail, TailFound, TailAbsent }
 import v2.std.collection { list_at_optional }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/lens/unit_modeling.dag b/src/v2/lens/unit_modeling.dag
index 5e04af5bf3f..38533e64004 100644
--- a/src/v2/lens/unit_modeling.dag
+++ b/src/v2/lens/unit_modeling.dag
@@ -8,7 +8,7 @@ import std.disposition { SingleAuthority }
 import v2.std.witness { Holds }
 import v2.std.node_query { edge_field_type_name, member_edge_type_node, member_not_a_binder_diagnostic }
 import v2.std.diagnostic { node_locus, outcome_accepted, outcome_rejected }
-import v2.std.optional { optional_absent, optional_present, optional_prefer_first_present }
+import std.optional { optional_absent, optional_present, optional_prefer_first_present }
 
 type UnitFieldRow {
   field: Symbol
diff --git a/src/v2/lens/vacuity.dag b/src/v2/lens/vacuity.dag
index 31a886ba5a3..10e73dd3ffa 100644
--- a/src/v2/lens/vacuity.dag
+++ b/src/v2/lens/vacuity.dag
@@ -30,7 +30,7 @@ import std.algebra { list_append }
 import v2.std.collection { list_at_optional }
 import v2.std.compilers.sugar { sugar_sequence_pair_optional }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
-import v2.std.optional { Absent, optional_absent, optional_present, Present }
+import std.optional { Absent, optional_absent, optional_present, Present }
 import v2.std.exact_structural_equality_zip_fold_predicate {
   exact_structural_equality_zip_fold
 }
diff --git a/src/v2/lens/wiring_liveness_preflight.dag b/src/v2/lens/wiring_liveness_preflight.dag
index 4656ef3f10c..53551588024 100644
--- a/src/v2/lens/wiring_liveness_preflight.dag
+++ b/src/v2/lens/wiring_liveness_preflight.dag
@@ -17,7 +17,7 @@ import v2.lens.common.graph_invariant {
   graph_reach_unreachable_diagnostic
 }
 import std.perturbation { BackwardDiffInDiffOut, perturbation_consistent }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/program.dag b/src/v2/program.dag
index 076a7881385..003eacf40e8 100644
--- a/src/v2/program.dag
+++ b/src/v2/program.dag
@@ -26,7 +26,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/std/algebra.dag b/src/v2/std/algebra.dag
index 8f696f2a02c..0f2c2824094 100644
--- a/src/v2/std/algebra.dag
+++ b/src/v2/std/algebra.dag
@@ -2,7 +2,7 @@ module v2.std.algebra
 
 import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.node { Conj, Edge, Authored, Node, TypeNode }
-import v2.std.optional { Optional, optional_absent, optional_present }
+import std.optional { Optional, optional_absent, optional_present }
 import std.algebra {
   AbelianGroup,
   BooleanAlgebra,
diff --git a/src/v2/std/algebra_structure_signature.dag b/src/v2/std/algebra_structure_signature.dag
index 29d47eef01d..148cfb81508 100644
--- a/src/v2/std/algebra_structure_signature.dag
+++ b/src/v2/std/algebra_structure_signature.dag
@@ -7,7 +7,7 @@ import v2.std.logic { bool_node }
 import v2.std.node { Atom, Conj, Disj, Edge, Authored, Node, Positional, StructuralLabel, Symbol, TypeNode }
 import std.algebra { list_snoc_item }
 import v2.std.collection { List }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // THE ALGEBRA'S STRUCTURE SIGNATURES AS NODES: each algebraic structure std.algebra declares (magma
 // through boolean algebra, equivalence, the free monoid) projected to the TypeNode its instances
diff --git a/src/v2/std/bounded_lattice_completeness.dag b/src/v2/std/bounded_lattice_completeness.dag
index 0accc6c85a3..e3b70c742e7 100644
--- a/src/v2/std/bounded_lattice_completeness.dag
+++ b/src/v2/std/bounded_lattice_completeness.dag
@@ -40,7 +40,7 @@ import v2.std.node {
   fold_node,
   StructuralLabel,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.node_query {
   binder_node_parts,
   NamedChildAmbiguous,
diff --git a/src/v2/std/cardinality.dag b/src/v2/std/cardinality.dag
index 0c8574ecbf5..00d7dc73720 100644
--- a/src/v2/std/cardinality.dag
+++ b/src/v2/std/cardinality.dag
@@ -10,7 +10,7 @@ import std.termination {
   descent_evidence_lattice_meet,
   evidence_rank
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/std/coercion.dag b/src/v2/std/coercion.dag
index 2386ce18ff6..6ef0f193e7e 100644
--- a/src/v2/std/coercion.dag
+++ b/src/v2/std/coercion.dag
@@ -35,7 +35,7 @@ import v2.std.find_witness {
   UniqueOnly,
   find_witness,
 }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.node { Conj, Edge, Authored, Node, Symbol, TypeNode, well_formed }
 import v2.std.refinement_widening_predicate { refinement_widening_is_strict_coarsening }
 import v2.std.witness { HomomorphismWitness, StructuralPropertyWitness }
diff --git a/src/v2/std/collection.dag b/src/v2/std/collection.dag
index d928f148c4f..16d531b476d 100644
--- a/src/v2/std/collection.dag
+++ b/src/v2/std/collection.dag
@@ -14,7 +14,7 @@ import v2.std.diagnostic {
   invariant_port_locus
 }
 import v2.std.node { Symbol }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/std/compilers/body_lowering.dag b/src/v2/std/compilers/body_lowering.dag
index 5c6d3a4a057..87af912e6b0 100644
--- a/src/v2/std/compilers/body_lowering.dag
+++ b/src/v2/std/compilers/body_lowering.dag
@@ -19,7 +19,7 @@ import v2.std.diagnostic {
   outcome_rejected
 }
 import v2.std.integer { Int }
-import v2.std.optional { Optional }
+import std.optional { Optional }
 import v2.std.node {
   Bind,
   Branch,
diff --git a/src/v2/std/compilers/cli_surface.dag b/src/v2/std/compilers/cli_surface.dag
index 875de3df389..331d1b57358 100644
--- a/src/v2/std/compilers/cli_surface.dag
+++ b/src/v2/std/compilers/cli_surface.dag
@@ -30,7 +30,7 @@ import v2.std.diagnostic {
   outcome_rejected
 }
 import v2.std.node { Atom, Node, Symbol, TypeNode }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 
 // WHY THIS EXISTS.
diff --git a/src/v2/std/compilers/compilation_unit.dag b/src/v2/std/compilers/compilation_unit.dag
index 643b5314eeb..03e542e5b56 100644
--- a/src/v2/std/compilers/compilation_unit.dag
+++ b/src/v2/std/compilers/compilation_unit.dag
@@ -11,7 +11,7 @@ import v2.std.algebra { any, fold_list, length }
 import v2.std.collection {
   map_get
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/std/compilers/lexing.dag b/src/v2/std/compilers/lexing.dag
index 81eae7d2eec..39782008475 100644
--- a/src/v2/std/compilers/lexing.dag
+++ b/src/v2/std/compilers/lexing.dag
@@ -13,7 +13,7 @@ import v2.std.collection {
   map_insert,
   map_lookup
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/std/compilers/semantic_decl_emission.dag b/src/v2/std/compilers/semantic_decl_emission.dag
index 702c2a4a01c..b064c7d8ba6 100644
--- a/src/v2/std/compilers/semantic_decl_emission.dag
+++ b/src/v2/std/compilers/semantic_decl_emission.dag
@@ -1,7 +1,7 @@
 module v2.std.compilers.semantic_decl_emission
 
 import std.types { List }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.qualified_name { declaration_reference_path_optional }
 import std.occurrence_identity { OccurrenceSynthetic }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
diff --git a/src/v2/std/compilers/target_model.dag b/src/v2/std/compilers/target_model.dag
index acb511b6796..563b81853cc 100644
--- a/src/v2/std/compilers/target_model.dag
+++ b/src/v2/std/compilers/target_model.dag
@@ -42,7 +42,7 @@ import v2.std.collection {
   map_insert,
   map_lookup
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/std/data_initializer_identity.dag b/src/v2/std/data_initializer_identity.dag
index 80f3cdc5ecc..08bd3b5ece8 100644
--- a/src/v2/std/data_initializer_identity.dag
+++ b/src/v2/std/data_initializer_identity.dag
@@ -4,7 +4,7 @@ import std.types { List }
 import v2.std.node { symbol_lexeme }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.decl_index { DeclFact }
-import v2.std.optional { optional_present, optional_absent, Optional, Present, Absent }
+import std.optional { optional_present, optional_absent, Optional, Present, Absent }
 
 // Resolved parent/arm projection for DataItem rows — qualified_name, module_path, rel_path, and
 // name locator grain (not occurrence identity). Host bridge marshals projection Node trees from
diff --git a/src/v2/std/demand_engine.dag b/src/v2/std/demand_engine.dag
index 247181db23a..8f1d3cdd514 100644
--- a/src/v2/std/demand_engine.dag
+++ b/src/v2/std/demand_engine.dag
@@ -13,7 +13,7 @@ import v2.std.algebra {
 }
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
 import std.algebra { Cons, Empty }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.dependency { DependencyRelation }
 import v2.std.integer { Int }
 import v2.std.text { String }
diff --git a/src/v2/std/effect_plan.dag b/src/v2/std/effect_plan.dag
index 311330b6b76..5d492da29cb 100644
--- a/src/v2/std/effect_plan.dag
+++ b/src/v2/std/effect_plan.dag
@@ -5,7 +5,7 @@ import std.dissolution { DissolutionCondition, unbound_dissolution }
 
 import v2.std.text { String }
 import v2.std.algebra { FreeMonoid }
-import v2.std.optional {
+import std.optional {
   Optional
 }
 import v2.std.diagnostic { EmitDirective }
diff --git a/src/v2/std/generic_instantiation.dag b/src/v2/std/generic_instantiation.dag
index 5d18c0e0200..53b4b848fe5 100644
--- a/src/v2/std/generic_instantiation.dag
+++ b/src/v2/std/generic_instantiation.dag
@@ -1,6 +1,6 @@
 module v2.std.generic_instantiation
 
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.collection { empty_map }
 type GenericSubstitution = Map<String, Node>
 
diff --git a/src/v2/std/grammar.dag b/src/v2/std/grammar.dag
index 66d72b6c1b8..4508ed40a68 100644
--- a/src/v2/std/grammar.dag
+++ b/src/v2/std/grammar.dag
@@ -13,7 +13,7 @@ import v2.std.collection {
   map_insert,
   map_lookup
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/std/grounding.dag b/src/v2/std/grounding.dag
index e72b498dc25..d403e540b7f 100644
--- a/src/v2/std/grounding.dag
+++ b/src/v2/std/grounding.dag
@@ -26,7 +26,7 @@ import v2.std.model_core {
   PrimitiveFactBundle
 }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 type PerLanguageFactBundleKey {
   subject_carrier: Node
diff --git a/src/v2/std/inhabitance.dag b/src/v2/std/inhabitance.dag
index 4c08f18ad22..fd0c0135184 100644
--- a/src/v2/std/inhabitance.dag
+++ b/src/v2/std/inhabitance.dag
@@ -33,7 +33,7 @@ import v2.std.node {
   node_synthetic
 }
 import std.algebra { list_append }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 import v2.std.witness { HomomorphismWitness, StructuralPropertyWitness }
 
 // WHAT A FORMAL IS DECLARED AS, READ AGAINST ITS OWN ARROW. A formal declared as one of the
diff --git a/src/v2/std/integer.dag b/src/v2/std/integer.dag
index 4db06ac00ee..b1764d4b420 100644
--- a/src/v2/std/integer.dag
+++ b/src/v2/std/integer.dag
@@ -8,7 +8,7 @@ import v2.std.algebra { TailAbsent, TailFound, fold_list, fold_list_node, length
 import v2.std.collection {
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/std/lens_verdict.dag b/src/v2/std/lens_verdict.dag
index 176f792449b..6b7002fa82e 100644
--- a/src/v2/std/lens_verdict.dag
+++ b/src/v2/std/lens_verdict.dag
@@ -21,7 +21,7 @@ import v2.std.integer { integer_int_to_decimal_string }
 import extdeps.languages.json.emit { quote_json_string }
 import v2.std.node { Node, Symbol, symbol_intern_lexeme, symbol_lexeme }
 import v2.std.grammar { node_atom_identity_optional }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.provenance { SpanIndex, node_occurrence_id_optional, span_index_empty, span_index_textual_locus_optional }
 import v2.std.qualified_name { qualified_name_to_dotted_string }
 import v2.std.text { String }
diff --git a/src/v2/std/list_introduction.dag b/src/v2/std/list_introduction.dag
index e4890f90efd..89f4301fe62 100644
--- a/src/v2/std/list_introduction.dag
+++ b/src/v2/std/list_introduction.dag
@@ -7,7 +7,7 @@ import v2.std.collection { Absent, Present, list_at_optional }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.node { ComputationNode, Edge, Node, Positional, Transform, all_edges_positional, node_with_occurrence_id }
 import v2.std.node_query { node_positional_child_targets }
-import v2.std.optional { Optional, optional_absent, optional_present }
+import std.optional { Optional, optional_absent, optional_present }
 import v2.std.qualified_name { QualifiedName, declaration_reference_path_optional, qualified_name_from_node, qualified_name_spine_node, qualified_name_spine_shape_present }
 
 // THE LIST-LITERAL INTRODUCTION, ONE AUTHORITY FOR BOTH DIRECTIONS. A list literal `[e1, .., en]`
diff --git a/src/v2/std/map_introduction.dag b/src/v2/std/map_introduction.dag
index a2fc9e71f23..0e864e1448f 100644
--- a/src/v2/std/map_introduction.dag
+++ b/src/v2/std/map_introduction.dag
@@ -3,7 +3,7 @@ module v2.std.map_introduction
 import std.algebra { list_snoc_item }
 import std.types { List, Map, String }
 import v2.std.collection { empty_map, map_insert, map_lookup }
-import v2.std.optional { Absent, Optional, Present, optional_absent }
+import std.optional { Absent, Optional, Present, optional_absent }
 import v2.std.integer { Int }
 import v2.std.list_introduction { list_introduction_elements_optional, list_introduction_head_path }
 import v2.std.node { Authored, ComputationNode, Edge, MapLiteralEntriesEdge, Node, Positional, Symbol, Transform, node_with_occurrence_id }
diff --git a/src/v2/std/native_agreement.dag b/src/v2/std/native_agreement.dag
index 3491f0148fa..093573a73b1 100644
--- a/src/v2/std/native_agreement.dag
+++ b/src/v2/std/native_agreement.dag
@@ -5,7 +5,7 @@ import v2.std.algebra { Cons, Empty }
 import v2.std.collection {
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent
diff --git a/src/v2/std/network.dag b/src/v2/std/network.dag
index b9e8e3040fa..71d5446202a 100644
--- a/src/v2/std/network.dag
+++ b/src/v2/std/network.dag
@@ -1,6 +1,6 @@
 module v2.std.network
 
-import v2.std.optional {
+import std.optional {
   Optional
 }
 import v2.std.text { String }
diff --git a/src/v2/std/node.dag b/src/v2/std/node.dag
index 8e0526d647a..28e9f79bdeb 100644
--- a/src/v2/std/node.dag
+++ b/src/v2/std/node.dag
@@ -2,7 +2,7 @@ module v2.std.node
 
 import std.types { List }
 import std.algebra { Cons, Empty, list_snoc_item }
-import v2.std.optional { Present }
+import std.optional { Present }
 import std.occurrence_identity {
   NodeOccurrenceIdentity,
   OccurrenceId,
diff --git a/src/v2/std/node_query.dag b/src/v2/std/node_query.dag
index 883ae1595cd..e660012b1b7 100644
--- a/src/v2/std/node_query.dag
+++ b/src/v2/std/node_query.dag
@@ -64,7 +64,7 @@ import v2.std.node {
 }
 import v2.std.qualified_name { QualifiedName, declaration_reference_path_optional, qualified_name_from_node, qualified_name_spine_shape_present }
 import std.constructors { Cardinality, Required, Optional }
-import v2.std.optional { Optional, optional_absent, optional_present }
+import std.optional { Optional, optional_absent, optional_present }
 
 fn coproduct_arm_key_list_from_node(node: Node) -> List<Symbol> {
   fold(
diff --git a/src/v2/std/operation_realization.dag b/src/v2/std/operation_realization.dag
index dad927f48e8..72c4917408e 100644
--- a/src/v2/std/operation_realization.dag
+++ b/src/v2/std/operation_realization.dag
@@ -1,6 +1,6 @@
 module v2.std.operation_realization
 
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import std.types { Bool, Int, List, Map, NonEmptyStr, String }
 import std.effect_grant {
   Envelope, HandlerBinding, CoveredBy, NoCoveringGrant, covering_grant,
diff --git a/src/v2/std/orchestration.dag b/src/v2/std/orchestration.dag
index ae13459e33d..1120e0f4e98 100644
--- a/src/v2/std/orchestration.dag
+++ b/src/v2/std/orchestration.dag
@@ -5,7 +5,7 @@ import std.dissolution { DissolutionCondition, unbound_dissolution }
 
 import v2.std.text { String }
 import std.algebra { FreeMonoid }
-import v2.std.optional {
+import std.optional {
   Optional
 }
 import v2.std.diagnostic { EmitDirective }
diff --git a/src/v2/std/provenance.dag b/src/v2/std/provenance.dag
index 80f4de93be3..f2f1b9c42f6 100644
--- a/src/v2/std/provenance.dag
+++ b/src/v2/std/provenance.dag
@@ -14,7 +14,7 @@ import v2.std.diagnostic {
   invariant_port_locus
 }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import std.occurrence_identity { OccurrenceId, OccurrenceMinted, OccurrencePending, OccurrenceProjected, OccurrenceSynthetic }
 import v2.std.witness { Holds, Violates, Witness, witness_from_optional, witness_violates }
 
diff --git a/src/v2/std/qualified_name.dag b/src/v2/std/qualified_name.dag
index 8a857dcdf44..39cedcc366d 100644
--- a/src/v2/std/qualified_name.dag
+++ b/src/v2/std/qualified_name.dag
@@ -16,7 +16,7 @@ import std.algebra { Cons, Empty, FreeMonoid, list_snoc_item }
 import std.decl_ref { DeclarationRef, WholeDeclaration }
 import std.disposition { Disposition, Scaffold, RealizationDispatch }
 import v2.std.algebra { HeadAbsent, HeadFound, fold_list, fold_list_node, fold_list_right, is_empty, is_prefix_of, length, list_head, list_init }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/std/resource_declaration.dag b/src/v2/std/resource_declaration.dag
index 0ccbe1dae7e..7bf92552467 100644
--- a/src/v2/std/resource_declaration.dag
+++ b/src/v2/std/resource_declaration.dag
@@ -2,7 +2,7 @@ module v2.std.resource_declaration
 
 import std.resource_contract { ResourceKind, Capability, Observation, ResourceMode, Read, ReadWrite }
 import v2.std.node { Symbol, symbol_intern_lexeme }
-import v2.std.optional { Optional, optional_absent, optional_present }
+import std.optional { Optional, optional_absent, optional_present }
 
 // THE VALUES A `resource` DECLARATION'S kind: AND mode: ENTRIES MAY TAKE, read against their home
 // (std.resource_contract) by v2.compiler.body_lowering_fold body_lower_resource_decl, which refuses an
diff --git a/src/v2/std/runtime.dag b/src/v2/std/runtime.dag
index 23a8b8f3059..ec7c9c327e8 100644
--- a/src/v2/std/runtime.dag
+++ b/src/v2/std/runtime.dag
@@ -4,7 +4,7 @@ import std.types { List }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/std/symbol_index.dag b/src/v2/std/symbol_index.dag
index 5dc8cde1db6..6526f9c933d 100644
--- a/src/v2/std/symbol_index.dag
+++ b/src/v2/std/symbol_index.dag
@@ -20,7 +20,7 @@ import v2.std.collection {
   map_contains_key,
   map_lookup
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/std/timeseries_signal.dag b/src/v2/std/timeseries_signal.dag
index ddcb5f17c83..d9ffc5b7165 100644
--- a/src/v2/std/timeseries_signal.dag
+++ b/src/v2/std/timeseries_signal.dag
@@ -3,7 +3,7 @@ module v2.std.timeseries_signal
 import std.types { List }
 import std.algebra { Cons, Empty }
 import v2.std.algebra { fold_list, fold_list_right }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present
diff --git a/src/v2/std/type_binder.dag b/src/v2/std/type_binder.dag
index 01c5ed26a07..f1e43bc482e 100644
--- a/src/v2/std/type_binder.dag
+++ b/src/v2/std/type_binder.dag
@@ -3,7 +3,7 @@ module v2.std.type_binder
 import std.types { List }
 import std.algebra { Cons, Empty, list_snoc_item }
 import v2.std.algebra { zip_map }
-import v2.std.optional { Optional, Present, Absent, optional_present, optional_absent }
+import std.optional { Optional, Present, Absent, optional_present, optional_absent }
 import v2.std.arrow_contract { arrow_contract_conforms }
 import v2.std.arrow_signature { signature_order_edge, arrow_signature_order_head_is_list_introduction }
 import v2.std.node_query { binder_node_parts }
diff --git a/src/v2/std/verdict.dag b/src/v2/std/verdict.dag
index b8d1a9ad254..427568004e2 100644
--- a/src/v2/std/verdict.dag
+++ b/src/v2/std/verdict.dag
@@ -3,7 +3,7 @@ module v2.std.verdict
 import std.types { List }
 import std.algebra { Monoid }
 import v2.std.algebra { is_empty }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent
 }
diff --git a/src/v2/std/witness.dag b/src/v2/std/witness.dag
index 1a22af5e31c..a6af6d9ba49 100644
--- a/src/v2/std/witness.dag
+++ b/src/v2/std/witness.dag
@@ -2,7 +2,7 @@ module v2.std.witness
 
 import v2.std.diagnostic { Diagnostic }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 
 type Witness<C>
   = Holds { value: C }
diff --git a/src/v2/test/claim/anonymous_param_binder_test.dag b/src/v2/test/claim/anonymous_param_binder_test.dag
index a5ddce384b8..bdce4f0b451 100644
--- a/src/v2/test/claim/anonymous_param_binder_test.dag
+++ b/src/v2/test/claim/anonymous_param_binder_test.dag
@@ -16,7 +16,7 @@ import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Arrow, Hash, Conj, Edge, Authored, Node, Positional, Symbol, TypeNode, content_hash, node_subtree_nodes, well_formed, StructuralLabel }
 import v2.std.node_query { pattern_wildcard_name }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.text { String }
 
diff --git a/src/v2/test/claim/bash_build_round_trip_test.dag b/src/v2/test/claim/bash_build_round_trip_test.dag
index a424ced50e7..0a897ecbbcc 100644
--- a/src/v2/test/claim/bash_build_round_trip_test.dag
+++ b/src/v2/test/claim/bash_build_round_trip_test.dag
@@ -19,7 +19,7 @@ import v2.extdeps.languages.bash_command_fold {
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/binder_admission/arm_scope_exit_marker_test.dag b/src/v2/test/claim/binder_admission/arm_scope_exit_marker_test.dag
index 9acf539cbad..f35847e9848 100644
--- a/src/v2/test/claim/binder_admission/arm_scope_exit_marker_test.dag
+++ b/src/v2/test/claim/binder_admission/arm_scope_exit_marker_test.dag
@@ -29,7 +29,7 @@ import v2.std.node {
   node_rebuild,
   node_synthetic,
 }
-import v2.std.optional { optional_absent }
+import std.optional { optional_absent }
 import v2.std.logic { Bool }
 import std.occurrence_identity { OccurrenceId, OccurrenceMinted }
 import v2.std.integer { Int }
diff --git a/src/v2/test/claim/binder_admission/callable_binder_slice_test.dag b/src/v2/test/claim/binder_admission/callable_binder_slice_test.dag
index 430bb7b87e0..c2f8441146b 100644
--- a/src/v2/test/claim/binder_admission/callable_binder_slice_test.dag
+++ b/src/v2/test/claim/binder_admission/callable_binder_slice_test.dag
@@ -46,7 +46,7 @@ import v2.std.node {
   TypeNode,
 
 }
-import v2.std.optional { Absent, Present, optional_absent }
+import std.optional { Absent, Present, optional_absent }
 import std.occurrence_identity { OccurrenceId, OccurrenceMinted, OccurrenceSynthetic }
 
 // THE CALLABLE-BINDER SLICE, READ AT ONE INTERFACE EACH, WITH SUPPLIED NODES. Every claim here
diff --git a/src/v2/test/claim/binder_node_test.dag b/src/v2/test/claim/binder_node_test.dag
index 0d5cf6b9cea..94f0fadba07 100644
--- a/src/v2/test/claim/binder_node_test.dag
+++ b/src/v2/test/claim/binder_node_test.dag
@@ -1,7 +1,7 @@
 module v2.test.claim.binder_node
 
 import std.types { List }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.lens.unit_modeling { field_unit_violation }
 import v2.std.type_binder { type_binder_node_conforms }
 import v2.std.arrow_signature { declared_signature }
diff --git a/src/v2/test/claim/binding/lexical_candidate_declaration_identity_test.dag b/src/v2/test/claim/binding/lexical_candidate_declaration_identity_test.dag
index 70fcb96a2a5..dce9ae4fbab 100644
--- a/src/v2/test/claim/binding/lexical_candidate_declaration_identity_test.dag
+++ b/src/v2/test/claim/binding/lexical_candidate_declaration_identity_test.dag
@@ -6,7 +6,7 @@ import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.algebra { any, length }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Node, Symbol, TypeNode }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name { QualifiedName, qualified_name_from_dotted_string, qualified_name_snoc }
 import v2.std.symbol_index {
   LexicalAmbiguous,
diff --git a/src/v2/test/claim/binding/module_scope_no_ancestor_leak_test.dag b/src/v2/test/claim/binding/module_scope_no_ancestor_leak_test.dag
index 065dbdf7ab6..430b8ec67c3 100644
--- a/src/v2/test/claim/binding/module_scope_no_ancestor_leak_test.dag
+++ b/src/v2/test/claim/binding/module_scope_no_ancestor_leak_test.dag
@@ -9,7 +9,7 @@ import v2.extdeps.languages.dag { dag_grammar_atom, dag_surface_edge }
 import v2.std.algebra { fold_list_node }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Authored, Conj, Disj, Edge, Node, Symbol, TypeNode }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name { QualifiedName, qualified_name_from_dotted_string, qualified_name_snoc }
 import v2.std.symbol_index {
   LexicalAmbiguous,
diff --git a/src/v2/test/claim/body_cast_node_test.dag b/src/v2/test/claim/body_cast_node_test.dag
index 64a246f9887..59c7039eed4 100644
--- a/src/v2/test/claim/body_cast_node_test.dag
+++ b/src/v2/test/claim/body_cast_node_test.dag
@@ -46,7 +46,7 @@ import v2.std.node {
   node_synthetic,
   well_formed
 }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 import v2.std.runtime { RuntimeValue }
 import v2.std.type_binder { cast_target_edge, cast_target_optional, type_binder_labels_conform }
 import v2.test.claim.fold_lowering { lowered_fixture_loop }
diff --git a/src/v2/test/claim/body_let_annotation_test.dag b/src/v2/test/claim/body_let_annotation_test.dag
index 55a8cd05606..050e3e60b10 100644
--- a/src/v2/test/claim/body_let_annotation_test.dag
+++ b/src/v2/test/claim/body_let_annotation_test.dag
@@ -35,7 +35,7 @@ import v2.std.diagnostic {
 }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { host_text_type_node, symbol_type_node, named_edges, positional_edges, Atom, Bind, ComputationNode, Edge, Authored, Node, Positional, Symbol, TypeNode, content_hash, node_subtree_nodes, node_synthetic }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 import v2.std.type_binder { cast_target_edge, edge_is_type_annotation, type_annotation_edge, type_annotation_optional, type_binder_labels_conform }
 import v2.compiler.reference_conservation_admission { conservation_subject_of_text }
 import v2.compiler.normalized_tree { admit_normalized_tree }
diff --git a/src/v2/test/claim/body_lowering/anonymous_record_test.dag b/src/v2/test/claim/body_lowering/anonymous_record_test.dag
index 92d883f7099..51516a36643 100644
--- a/src/v2/test/claim/body_lowering/anonymous_record_test.dag
+++ b/src/v2/test/claim/body_lowering/anonymous_record_test.dag
@@ -19,7 +19,7 @@ import v2.std.artifact { Artifact, SourceFile }
 import v2.std.cross_tree.import_model { DagTree }
 import v2.std.diagnostic { Accepted, Outcome, Rejected, diagnostics_fatal_reason }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.node { Hash, Node, Symbol, content_hash, node_subtree_nodes, symbol_lexeme }
 import v2.std.node_query { ConstructTagAuthored, ConstructTagElided, NotAConstruct, construct_tag_reading, construct_tag_path_optional }
 import v2.std.qualified_name { qualified_name_from_dotted_string, qualified_name_to_dotted_string }
diff --git a/src/v2/test/claim/body_lowering/arrow_body_form_semantic_helpers.dag b/src/v2/test/claim/body_lowering/arrow_body_form_semantic_helpers.dag
index 5850ba6ff0d..a256c292b6b 100644
--- a/src/v2/test/claim/body_lowering/arrow_body_form_semantic_helpers.dag
+++ b/src/v2/test/claim/body_lowering/arrow_body_form_semantic_helpers.dag
@@ -46,7 +46,7 @@ import v2.std.node {
   resolved_reference_body_kind,
 }
 import v2.std.node_query { find_arrow_body_child }
-import v2.std.optional { Optional, Present, optional_absent, optional_present }
+import std.optional { Optional, Present, optional_absent, optional_present }
 import v2.std.runtime { RuntimePrimitive, RuntimeValue }
 import v2.test.lens_common.infer_fixture { claim_inferred_facts_from_nodes }
 
diff --git a/src/v2/test/claim/body_lowering/arrow_body_form_witness_test.dag b/src/v2/test/claim/body_lowering/arrow_body_form_witness_test.dag
index 427dd5021ea..7f9afbe01e7 100644
--- a/src/v2/test/claim/body_lowering/arrow_body_form_witness_test.dag
+++ b/src/v2/test/claim/body_lowering/arrow_body_form_witness_test.dag
@@ -48,7 +48,7 @@ import v2.std.node {
   core_edge_label,
 }
 import v2.std.qualified_name { declaration_reference_node }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 import v2.std.node_query { binder_edge }
 import v2.test.claim.body_lowering.arrow_body_form_semantic_helpers {
   ArrowBodyFormAdmissionProduction,
diff --git a/src/v2/test/claim/body_lowering/arrow_lambda_block_body_test.dag b/src/v2/test/claim/body_lowering/arrow_lambda_block_body_test.dag
index de42aca4904..7f852d7e06b 100644
--- a/src/v2/test/claim/body_lowering/arrow_lambda_block_body_test.dag
+++ b/src/v2/test/claim/body_lowering/arrow_lambda_block_body_test.dag
@@ -12,7 +12,7 @@ import v2.compiler.program_assembly { dag_prepared_grammar }
 import v2.std.algebra { any }
 import v2.std.collection { List }
 import v2.std.logic { Bool }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.compiler.tokenize { tokenize }
 import v2.extdeps.languages.dag {
   dag_language_model,
diff --git a/src/v2/test/claim/body_lowering/atom_body_discriminator_helpers.dag b/src/v2/test/claim/body_lowering/atom_body_discriminator_helpers.dag
index 573e8e847b8..ae846725356 100644
--- a/src/v2/test/claim/body_lowering/atom_body_discriminator_helpers.dag
+++ b/src/v2/test/claim/body_lowering/atom_body_discriminator_helpers.dag
@@ -32,7 +32,7 @@ import v2.std.node_query {
   node_positional_child_targets
 }
 import v2.std.collection { list_at_optional }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 
 data atom_body_discriminator_module_source: String = "module atom_body_discriminator\n\nfn id(x: Int) -> Int { x }\nfn zero() -> Int { 0 }\nfn add(x: Int, y: Int) -> Int { x + y }\nfn zero_binary() -> Int { 1 + 1 }\n"
 
diff --git a/src/v2/test/claim/body_lowering/caret_symbol_value_lowering_test.dag b/src/v2/test/claim/body_lowering/caret_symbol_value_lowering_test.dag
index 4ba632f0bf6..f6d407c6da4 100644
--- a/src/v2/test/claim/body_lowering/caret_symbol_value_lowering_test.dag
+++ b/src/v2/test/claim/body_lowering/caret_symbol_value_lowering_test.dag
@@ -12,7 +12,7 @@ import v2.std.diagnostic { Accepted, Rejected, diagnostics_fatal_reason }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.node { Node, Symbol, node_subtree_nodes }
 import v2.std.node_query { node_positional_child_targets }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 // A CARET SYMBOL IN VALUE POSITION LOWERS TO A SYMBOL LITERAL CARRYING ITS NAME.
diff --git a/src/v2/test/claim/body_lowering/enclosing_expression_structure_test.dag b/src/v2/test/claim/body_lowering/enclosing_expression_structure_test.dag
index ef3d0f0e6b2..c8ad77c247e 100644
--- a/src/v2/test/claim/body_lowering/enclosing_expression_structure_test.dag
+++ b/src/v2/test/claim/body_lowering/enclosing_expression_structure_test.dag
@@ -8,7 +8,7 @@ import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { ComputationNode, Match, Node, Symbol, Transform }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/body_lowering/fn_body_seam_witness_helpers.dag b/src/v2/test/claim/body_lowering/fn_body_seam_witness_helpers.dag
index 16950186101..a4076272ec5 100644
--- a/src/v2/test/claim/body_lowering/fn_body_seam_witness_helpers.dag
+++ b/src/v2/test/claim/body_lowering/fn_body_seam_witness_helpers.dag
@@ -20,7 +20,7 @@ import v2.extdeps.languages.dag {
   dag_language_model,
   parse_production_emitted_identity_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/test/claim/body_lowering/fold_operand_structure_test.dag b/src/v2/test/claim/body_lowering/fold_operand_structure_test.dag
index 9d6daeb5136..b30a1d89b28 100644
--- a/src/v2/test/claim/body_lowering/fold_operand_structure_test.dag
+++ b/src/v2/test/claim/body_lowering/fold_operand_structure_test.dag
@@ -9,7 +9,7 @@ import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { ComputationNode, Node, Symbol, Transform }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/body_lowering/function_value_body_route_test.dag b/src/v2/test/claim/body_lowering/function_value_body_route_test.dag
index d5ad5101e47..7012aaeeda6 100644
--- a/src/v2/test/claim/body_lowering/function_value_body_route_test.dag
+++ b/src/v2/test/claim/body_lowering/function_value_body_route_test.dag
@@ -16,7 +16,7 @@ import v2.std.cross_tree.import_model { DagTree, V2Tree }
 import v2.std.diagnostic { Accepted, NodeLocus, Rejected, diagnostics_fatal_reason }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent }
+import std.optional { Absent, Optional, Present, optional_absent }
 import v2.std.qualified_name { qualified_name_from_dotted_string }
 import v2.std.text { String }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
diff --git a/src/v2/test/claim/body_lowering/if_arm_position_test.dag b/src/v2/test/claim/body_lowering/if_arm_position_test.dag
index 4be5bf96fda..13d5704b050 100644
--- a/src/v2/test/claim/body_lowering/if_arm_position_test.dag
+++ b/src/v2/test/claim/body_lowering/if_arm_position_test.dag
@@ -11,7 +11,7 @@ import v2.std.integer { Int }
 import v2.std.language_model { LanguageModel }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, node_subtree_nodes, symbol_lexeme }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/body_lowering/infer_transform_binary_infix_witness_helpers.dag b/src/v2/test/claim/body_lowering/infer_transform_binary_infix_witness_helpers.dag
index e2760d60335..f48edc90b54 100644
--- a/src/v2/test/claim/body_lowering/infer_transform_binary_infix_witness_helpers.dag
+++ b/src/v2/test/claim/body_lowering/infer_transform_binary_infix_witness_helpers.dag
@@ -22,7 +22,7 @@ import v2.std.node {
   node_synthetic
 }
 import v2.std.node_query { find_arrow_body_child }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.witness { Holds, Violates }
 import v2.test.claim.body_lowering.wave1_gate1_normalize_add_helpers {
   wave1_gate1_find_arrow_in_module,
diff --git a/src/v2/test/claim/body_lowering/map_literal_test.dag b/src/v2/test/claim/body_lowering/map_literal_test.dag
index 4349aab8d35..8524751a846 100644
--- a/src/v2/test/claim/body_lowering/map_literal_test.dag
+++ b/src/v2/test/claim/body_lowering/map_literal_test.dag
@@ -18,7 +18,7 @@ import v2.std.artifact { Artifact, SourceFile }
 import v2.std.cross_tree.import_model { DagTree }
 import v2.std.diagnostic { Accepted, Outcome, Rejected, diagnostics_fatal_reason }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.node { Hash, Node, Symbol, content_hash, node_subtree_nodes }
 import v2.std.node_query { node_positional_child_targets }
 import v2.std.qualified_name { declaration_reference_path_optional, qualified_name_from_dotted_string }
diff --git a/src/v2/test/claim/body_lowering/match_arm_list_structure_test.dag b/src/v2/test/claim/body_lowering/match_arm_list_structure_test.dag
index 288c61f3069..e7a56bb7666 100644
--- a/src/v2/test/claim/body_lowering/match_arm_list_structure_test.dag
+++ b/src/v2/test/claim/body_lowering/match_arm_list_structure_test.dag
@@ -9,7 +9,7 @@ import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Conj, Edge, Authored, Node, Symbol, TypeNode, node_synthetic, CoreEdgeLabel, MatchArmBodyEdge, MatchArmPatternEdge, edge_is_core }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty, FreeMonoid, list_append, list_snoc_item }
 
diff --git a/src/v2/test/claim/body_lowering/match_position_structure_test.dag b/src/v2/test/claim/body_lowering/match_position_structure_test.dag
index 73e2e83aa08..371f67f6965 100644
--- a/src/v2/test/claim/body_lowering/match_position_structure_test.dag
+++ b/src/v2/test/claim/body_lowering/match_position_structure_test.dag
@@ -14,7 +14,7 @@ import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Bind, ComputationNode, Found, Match, Node, Symbol, node_subtree_nodes, MatchArmBodyEdge, core_edge_target_lookup }
 import v2.std.node_query { node_positional_child_targets }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import v2.extdeps.languages.dag { dag_language_model }
 import std.algebra { Cons, Empty, FreeMonoid }
diff --git a/src/v2/test/claim/body_lowering/parameter_slot_refusal_test.dag b/src/v2/test/claim/body_lowering/parameter_slot_refusal_test.dag
index 0301f5aa6b0..b7be6c7c9d6 100644
--- a/src/v2/test/claim/body_lowering/parameter_slot_refusal_test.dag
+++ b/src/v2/test/claim/body_lowering/parameter_slot_refusal_test.dag
@@ -13,7 +13,7 @@ import v2.extdeps.languages.dag { ParseSubtreeAbsent, ParseSubtreeFound, dag_lan
 import v2.std.diagnostic { Accepted, Rejected, diagnostics_fatal_reason }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Edge, Authored, Node, Symbol, TypeNode, node_synthetic }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import std.algebra { list_snoc_item }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/body_lowering/peeled_shell_fold_head_test.dag b/src/v2/test/claim/body_lowering/peeled_shell_fold_head_test.dag
index 3dfe3065a26..0d1e70bfc07 100644
--- a/src/v2/test/claim/body_lowering/peeled_shell_fold_head_test.dag
+++ b/src/v2/test/claim/body_lowering/peeled_shell_fold_head_test.dag
@@ -9,7 +9,7 @@ import v2.extdeps.languages.dag { dag_lex, parse_production_emitted_identity_opt
 import v2.std.diagnostic { Accepted, Outcome, Rejected, bind_outcome }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // body_lower_try_body_lowered no longer retries body_lower_try_fold_loop on
 // body_lower_unwrap_surface_shell(node) (gunbc#12495). That deletion preserves
diff --git a/src/v2/test/claim/body_lowering/plain_type_decl_lowering_test.dag b/src/v2/test/claim/body_lowering/plain_type_decl_lowering_test.dag
index 2a69e007785..93b55f7df40 100644
--- a/src/v2/test/claim/body_lowering/plain_type_decl_lowering_test.dag
+++ b/src/v2/test/claim/body_lowering/plain_type_decl_lowering_test.dag
@@ -5,7 +5,7 @@ import v2.compiler.symbol_index_fill { symbol_index_declared }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Conj, Disj, Edge, Authored, Node, Positional, Symbol, TypeNode, node_subtree_nodes, StructuralLabel }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.type_binder { GenericTypeDecl, OpaqueTypeDecl, PlainTypeDecl, TypeAlias, type_decl_view }
 import v2.test.claim.type_param_binder_frame { tpb_assemble }
 
diff --git a/src/v2/test/claim/body_lowering/qualified_construct_test.dag b/src/v2/test/claim/body_lowering/qualified_construct_test.dag
index e94028e47fc..762ccaab9c5 100644
--- a/src/v2/test/claim/body_lowering/qualified_construct_test.dag
+++ b/src/v2/test/claim/body_lowering/qualified_construct_test.dag
@@ -19,7 +19,7 @@ import v2.std.cross_tree.import_model { DagTree }
 import v2.std.compilers.target_model { target_value_expr_record_construct_gate }
 import v2.std.diagnostic { Accepted, Outcome, Rejected, diagnostics_fatal_reason }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.node { Hash, Node, Symbol, content_hash, node_subtree_nodes }
 import v2.std.node_query { construct_tag_optional, construct_tag_path_optional }
 import v2.std.qualified_name { declaration_reference_path_optional, qualified_name_from_dotted_string, qualified_name_to_dotted_string }
diff --git a/src/v2/test/claim/body_lowering/reify_operand_refusal_test.dag b/src/v2/test/claim/body_lowering/reify_operand_refusal_test.dag
index 789b253350a..8c056740594 100644
--- a/src/v2/test/claim/body_lowering/reify_operand_refusal_test.dag
+++ b/src/v2/test/claim/body_lowering/reify_operand_refusal_test.dag
@@ -7,7 +7,7 @@ import v2.extdeps.languages.dag { dag_language_model, parse_production_emitted_i
 import v2.std.diagnostic { Accepted, Rejected, diagnostics_fatal_reason }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Branch, ComputationNode, Edge, Node, Positional, Symbol, Transform, TypeNode, node_synthetic }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/body_lowering/statement_let_bind_test.dag b/src/v2/test/claim/body_lowering/statement_let_bind_test.dag
index 604052fea4c..d9c357c7d33 100644
--- a/src/v2/test/claim/body_lowering/statement_let_bind_test.dag
+++ b/src/v2/test/claim/body_lowering/statement_let_bind_test.dag
@@ -12,7 +12,7 @@ import v2.compiler.reference_conservation { ReferenceConservationSubject }
 import v2.std.type_binder { type_annotation_optional }
 import v2.extdeps.languages.dag { dag_int_literal_magnitude_node_optional, dag_node_is_int_literal_atom }
 import v2.std.node { Bind, ComputationNode, Authored, Node, Positional, node_subtree_nodes, StructuralLabel }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.diagnostic { ByteRange, DeclarationLocus, Extent, InvariantPortLocus, Locus, NodeLocus, SourcePortLocus, Textual, WholeFile }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
diff --git a/src/v2/test/claim/body_lowering/string_literal_value_lowering_test.dag b/src/v2/test/claim/body_lowering/string_literal_value_lowering_test.dag
index c94c082ce68..235fd195a6b 100644
--- a/src/v2/test/claim/body_lowering/string_literal_value_lowering_test.dag
+++ b/src/v2/test/claim/body_lowering/string_literal_value_lowering_test.dag
@@ -15,7 +15,7 @@ import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.diagnostic { Accepted, Rejected, diagnostics_fatal_reason }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol, node_subtree_nodes }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/body_lowering/wave1_gate1_a1_symbol_index_helpers.dag b/src/v2/test/claim/body_lowering/wave1_gate1_a1_symbol_index_helpers.dag
index dd5efc23dec..5dcfce52ab4 100644
--- a/src/v2/test/claim/body_lowering/wave1_gate1_a1_symbol_index_helpers.dag
+++ b/src/v2/test/claim/body_lowering/wave1_gate1_a1_symbol_index_helpers.dag
@@ -1,7 +1,7 @@
 module v2.test.claim.body_lowering.wave1_gate1_a1_symbol_index_helpers
 
 import v2.compiler.reference_conservation_admission { conserved_normalize_of_text, no_explained_drops }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 
 
 data wave1_gate1_a1_add_module_source: String = "module add_probe\n\nfn add(x: Int, y: Int) -> Int { x + y }\n"
diff --git a/src/v2/test/claim/body_lowering/wave1_gate1_b1_bare_call_helpers.dag b/src/v2/test/claim/body_lowering/wave1_gate1_b1_bare_call_helpers.dag
index 059ae59f335..0cc1a8cbaf9 100644
--- a/src/v2/test/claim/body_lowering/wave1_gate1_b1_bare_call_helpers.dag
+++ b/src/v2/test/claim/body_lowering/wave1_gate1_b1_bare_call_helpers.dag
@@ -4,7 +4,7 @@ import v2.std.node { Authored, StructuralLabel, ArrowBodyEdge, edge_is_core }
 
 import v2.compiler.reference_conservation_admission { conserved_normalize_of_text, no_explained_drops }
 import v2.extdeps.languages.dag { qualified_name_from_module_node }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 
 
 data wave1_gate1_b1_bare_call_module_source: String = "module wave1_gate1_b1_bare_call\n\nfn helper(x: Int) -> Int { x + x }\n\nfn caller(x: Int) -> Int { helper(x) }\n"
diff --git a/src/v2/test/claim/body_lowering/wave1_gate1_normalize_add_helpers.dag b/src/v2/test/claim/body_lowering/wave1_gate1_normalize_add_helpers.dag
index d85a8f38ab7..aed3ec82cd8 100644
--- a/src/v2/test/claim/body_lowering/wave1_gate1_normalize_add_helpers.dag
+++ b/src/v2/test/claim/body_lowering/wave1_gate1_normalize_add_helpers.dag
@@ -8,7 +8,7 @@ import v2.compiler.parse { parse_module }
 import v2.compiler.resolve { resolve }
 import v2.compiler.tokenize { tokenize }
 import v2.extdeps.languages.dag { dag_language_model }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/test/claim/body_lowering/wildcard_pattern_form_test.dag b/src/v2/test/claim/body_lowering/wildcard_pattern_form_test.dag
index 66174cc2e20..774b603e340 100644
--- a/src/v2/test/claim/body_lowering/wildcard_pattern_form_test.dag
+++ b/src/v2/test/claim/body_lowering/wildcard_pattern_form_test.dag
@@ -11,7 +11,7 @@ import v2.std.integer { Int }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Authored, Node, Symbol, CoreEdgeLabel, MatchArmPatternEdge, edge_is_core }
 import v2.std.node_query { construct_tag_optional, is_wildcard_pattern, pattern_wildcard_name }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty, FreeMonoid, list_append }
 
diff --git a/src/v2/test/claim/body_lowering_qualified_path_test.dag b/src/v2/test/claim/body_lowering_qualified_path_test.dag
index efd5828214a..3cebefcc46d 100644
--- a/src/v2/test/claim/body_lowering_qualified_path_test.dag
+++ b/src/v2/test/claim/body_lowering_qualified_path_test.dag
@@ -48,7 +48,7 @@ import v2.std.node_query {
   find_named_child,
   node_positional_child_targets
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name {
   qualified_name_from_node,
   qualified_name_to_dotted_string
diff --git a/src/v2/test/claim/body_lowering_unrecognised_lowered_shape_test.dag b/src/v2/test/claim/body_lowering_unrecognised_lowered_shape_test.dag
index 18457569713..a0c343e3cd6 100644
--- a/src/v2/test/claim/body_lowering_unrecognised_lowered_shape_test.dag
+++ b/src/v2/test/claim/body_lowering_unrecognised_lowered_shape_test.dag
@@ -24,7 +24,7 @@ import v2.std.node {
   node_synthetic
 }
 import v2.std.node_query { field_projection_node }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // The subject is the refusal body lowering gives a lowered shape no reader recognises
 // (v2.compiler.body_lowering_fold body_lower_is_unrecognised_lowered_shape), so the inputs are
diff --git a/src/v2/test/claim/callexec/declaration_reference_eval_test.dag b/src/v2/test/claim/callexec/declaration_reference_eval_test.dag
index c5c0266f34c..b88995b70a4 100644
--- a/src/v2/test/claim/callexec/declaration_reference_eval_test.dag
+++ b/src/v2/test/claim/callexec/declaration_reference_eval_test.dag
@@ -56,7 +56,7 @@ import v2.test.lens_common.infer_fixture {
 import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.qualified_name { declaration_reference_node }
 import v2.std.diagnostic { outcome_accepted }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import std.types { List }
 import v2.std.collection { list_at_optional }
 import v2.std.integer { Int, integer_signed_i32_le_bytes_to_int }
diff --git a/src/v2/test/claim/callexec/let_match_early_return_eval_test.dag b/src/v2/test/claim/callexec/let_match_early_return_eval_test.dag
index 437e05b0884..f837a5e2595 100644
--- a/src/v2/test/claim/callexec/let_match_early_return_eval_test.dag
+++ b/src/v2/test/claim/callexec/let_match_early_return_eval_test.dag
@@ -16,7 +16,7 @@ import v2.std.artifact { Artifact, SourceFile }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.logic { Bool }
 import v2.std.node { Node, NodeFold, Symbol, fold_node }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.collection { List }
 import v2.std.integer { Int, integer_signed_i32_le_bytes_to_int }
 import v2.std.runtime { RuntimePrimitive, RuntimeValue }
diff --git a/src/v2/test/claim/callexec/synthetic_facts_key_collision_test.dag b/src/v2/test/claim/callexec/synthetic_facts_key_collision_test.dag
index 5e48d9ee6d5..1194274ae3f 100644
--- a/src/v2/test/claim/callexec/synthetic_facts_key_collision_test.dag
+++ b/src/v2/test/claim/callexec/synthetic_facts_key_collision_test.dag
@@ -9,7 +9,7 @@ import v2.compiler.inferred_tree { InferredFactsEntry }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.compiler.resolve { ResolvedTree }
 import v2.std.node { Node }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import std.algebra { Cons, Empty }
 import v2.std.algebra { fold_list }
 import std.types { List }
diff --git a/src/v2/test/claim/cargo_build_run_argv_witness_test.dag b/src/v2/test/claim/cargo_build_run_argv_witness_test.dag
index c63e2486677..3e3b14d2bcc 100644
--- a/src/v2/test/claim/cargo_build_run_argv_witness_test.dag
+++ b/src/v2/test/claim/cargo_build_run_argv_witness_test.dag
@@ -1,7 +1,7 @@
 module v2.test.claim.cargo_build_run_argv_witness
 
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.operation_argv {
   operation_argv_bind_text,
   operation_argv_bind_text_list,
diff --git a/src/v2/test/claim/collection/list_at_equivalence_test.dag b/src/v2/test/claim/collection/list_at_equivalence_test.dag
index b3d7f46de91..b39be969317 100644
--- a/src/v2/test/claim/collection/list_at_equivalence_test.dag
+++ b/src/v2/test/claim/collection/list_at_equivalence_test.dag
@@ -2,7 +2,7 @@ module v2.test.claim.collection.list_at_equivalence
 
 import std.types { List }
 import v2.std.collection { list_at_optional, list_at_reference }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/compilation_unit_witness_test.dag b/src/v2/test/claim/compilation_unit_witness_test.dag
index dc3e5626b16..43b37036ce7 100644
--- a/src/v2/test/claim/compilation_unit_witness_test.dag
+++ b/src/v2/test/claim/compilation_unit_witness_test.dag
@@ -37,7 +37,7 @@ import v2.std.compilers.compilation_unit {
   resolve_member_interfaces,
 }
 import v2.std.collection { empty_map, map_insert }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.node {
   Arrow,
   Atom,
diff --git a/src/v2/test/claim/compiler/collection_callback_realization_test.dag b/src/v2/test/claim/compiler/collection_callback_realization_test.dag
index 00803e857f8..096045d5ef7 100644
--- a/src/v2/test/claim/compiler/collection_callback_realization_test.dag
+++ b/src/v2/test/claim/compiler/collection_callback_realization_test.dag
@@ -9,7 +9,7 @@ import v2.std.collection { List, list_at_optional }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.node_query { find_named_child }
 import v2.std.qualified_name { declaration_reference_path_optional, lexical_reference_label_optional, qualified_name_to_dotted_string }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.logic { Bool }
 import std.algebra { Cons, Empty }
diff --git a/src/v2/test/claim/compiler/collection_concat_realization_test.dag b/src/v2/test/claim/compiler/collection_concat_realization_test.dag
index b8fe46f2f6b..c6fa618c509 100644
--- a/src/v2/test/claim/compiler/collection_concat_realization_test.dag
+++ b/src/v2/test/claim/compiler/collection_concat_realization_test.dag
@@ -7,7 +7,7 @@ import std.types { Bool, List }
 import v2.std.diagnostic { Accepted, Rejected, diagnostics_fatal_reason, node_locus }
 import v2.test.claim.compiler.compile_eval_thesis_proof { compile_eval_thesis_termination_proof }
 import v2.std.qualified_name { declaration_reference_node, declaration_reference_path_optional, parameter_reference_path_optional, qualified_name_last_segment, qualified_name_to_dotted_string }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Edge, Instantiation, Node, Positional, TypeNode, node_subtree_nodes, node_synthetic, symbol_intern_lexeme }
 import v2.std.node_query { node_positional_child_targets }
diff --git a/src/v2/test/claim/compiler/compile_eval_thesis_proof_test.dag b/src/v2/test/claim/compiler/compile_eval_thesis_proof_test.dag
index 43c51f335ce..20c9e62c8cb 100644
--- a/src/v2/test/claim/compiler/compile_eval_thesis_proof_test.dag
+++ b/src/v2/test/claim/compiler/compile_eval_thesis_proof_test.dag
@@ -18,7 +18,7 @@ import v2.std.collection { Map }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/compiler/dependency_demand_census_test.dag b/src/v2/test/claim/compiler/dependency_demand_census_test.dag
index c96ca53cdbe..307d7bf5697 100644
--- a/src/v2/test/claim/compiler/dependency_demand_census_test.dag
+++ b/src/v2/test/claim/compiler/dependency_demand_census_test.dag
@@ -35,7 +35,7 @@ import v2.std.diagnostic { Accepted, Outcome, Rejected, diagnostics_fatal }
 import v2.std.integer { Int }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name { qualified_name_from_dotted_string, qualified_name_to_dotted_string }
 import v2.std.text { String }
 
diff --git a/src/v2/test/claim/compiler/infer_application_argument_inhabitance_witness_test.dag b/src/v2/test/claim/compiler/infer_application_argument_inhabitance_witness_test.dag
index 95c03c0e07c..1e33dac4e3f 100644
--- a/src/v2/test/claim/compiler/infer_application_argument_inhabitance_witness_test.dag
+++ b/src/v2/test/claim/compiler/infer_application_argument_inhabitance_witness_test.dag
@@ -28,7 +28,7 @@ import v2.std.diagnostic {
 }
 import std.algebra { list_snoc_item }
 import v2.std.type_binder { type_binder_set_children, type_params_edge }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.node_query { binder_edge }
 import v2.std.node {
   ComputationNode,
diff --git a/src/v2/test/claim/compiler/infer_arrow_elimination_witness_test.dag b/src/v2/test/claim/compiler/infer_arrow_elimination_witness_test.dag
index 108f22e7b67..0b7a935a127 100644
--- a/src/v2/test/claim/compiler/infer_arrow_elimination_witness_test.dag
+++ b/src/v2/test/claim/compiler/infer_arrow_elimination_witness_test.dag
@@ -15,7 +15,7 @@ import v2.extdeps.languages.dag { dag_arrow_with_body_node, dag_int_literal_fixt
 import v2.std.diagnostic { Accepted, Outcome, Rejected, Some, diagnostics_has_reason }
 import v2.std.integer { integer_int_type_node }
 import v2.std.logic { bool_node }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.runtime { RuntimeValue }
 import v2.std.witness { Holds, Violates }
 import v2.std.node { ComputationNode, Conj, Edge, Authored, Node, Positional, Symbol, Transform, TypeNode, node_synthetic }
diff --git a/src/v2/test/claim/compiler/infer_fold_member_instance_test.dag b/src/v2/test/claim/compiler/infer_fold_member_instance_test.dag
index 592fe1b5380..dae2c75a68b 100644
--- a/src/v2/test/claim/compiler/infer_fold_member_instance_test.dag
+++ b/src/v2/test/claim/compiler/infer_fold_member_instance_test.dag
@@ -2,7 +2,7 @@ module v2.test.claim.compiler.infer_fold_member_instance
 
 import v2.compiler.resolve { ResolvedTree }
 import v2.compiler.infer { infer }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.test.claim.body_let_annotation { bla_assemble_with_peers, bla_q_artifact, bla_r_artifact, bla_source }
 import v2.compiler.source_authority { DagSourceReadWitness }
 import v2.std.collection { List }
diff --git a/src/v2/test/claim/compiler/infer_record_construct_field_inhabitance_witness_test.dag b/src/v2/test/claim/compiler/infer_record_construct_field_inhabitance_witness_test.dag
index f8a745d2ecb..d9c43a793a3 100644
--- a/src/v2/test/claim/compiler/infer_record_construct_field_inhabitance_witness_test.dag
+++ b/src/v2/test/claim/compiler/infer_record_construct_field_inhabitance_witness_test.dag
@@ -20,7 +20,7 @@ import v2.std.diagnostic { Accepted, Diagnostic, Diagnostics, None, Outcome, Rej
 import v2.std.integer { integer_int_type_node }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.logic { bool_node }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.node { Arrow, Edge, Authored, StructuralLabel, Node, Positional, Symbol, TypeNode, node_subtree_nodes }
 import v2.std.node_query { construct_field_edges, construct_tag_optional, find_named_child }
 import v2.std.qualified_name { declaration_reference_path_optional, qualified_name_from_dotted_string, qualified_name_to_dotted_string }
diff --git a/src/v2/test/claim/compiler/kernel_value_type_roster_witness_test.dag b/src/v2/test/claim/compiler/kernel_value_type_roster_witness_test.dag
index 53d1e1a4749..8df7137c1ea 100644
--- a/src/v2/test/claim/compiler/kernel_value_type_roster_witness_test.dag
+++ b/src/v2/test/claim/compiler/kernel_value_type_roster_witness_test.dag
@@ -28,7 +28,7 @@ import v2.std.integer { integer_int_type_node }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.logic { bool_node }
 import v2.std.node { Atom, Node, Symbol, TypeNode, symbol_intern_lexeme, symbol_type_node }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.qualified_name { qualified_name_from_dotted_string }
 import v2.std.text { String }
 import std.algebra { Empty, FreeMonoid }
diff --git a/src/v2/test/claim/dag_acceptance_test.dag b/src/v2/test/claim/dag_acceptance_test.dag
index 8ca603ca409..d02100180da 100644
--- a/src/v2/test/claim/dag_acceptance_test.dag
+++ b/src/v2/test/claim/dag_acceptance_test.dag
@@ -5,7 +5,7 @@ import std.algebra { FreeSemigroup }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.measure { millisecond }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import v2.extdeps.languages.rust { rust_target_model }
 import v2.extdeps.languages.rust_emit_small_test { rust_emit_small_translation_claim }
diff --git a/src/v2/test/claim/dag_algebra_inhabitance_test.dag b/src/v2/test/claim/dag_algebra_inhabitance_test.dag
index 13b10f5b743..1413d9eb0dc 100644
--- a/src/v2/test/claim/dag_algebra_inhabitance_test.dag
+++ b/src/v2/test/claim/dag_algebra_inhabitance_test.dag
@@ -10,7 +10,7 @@ import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.qualified_name { declaration_reference_path_optional, qualified_name_to_dotted_string }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Authored, Conj, Edge, Node, Symbol, TypeNode }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/declaration_graft_assemble_test.dag b/src/v2/test/claim/declaration_graft_assemble_test.dag
index be8ec7de457..1c52ca0f51a 100644
--- a/src/v2/test/claim/declaration_graft_assemble_test.dag
+++ b/src/v2/test/claim/declaration_graft_assemble_test.dag
@@ -3,7 +3,7 @@ module v2.test.claim.declaration_graft_assemble
 import v2.compiler.resolve { ResolvedTree }
 import v2.std.symbol_index { symbol_index_lookup }
 import v2.std.node_query { find_named_child }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import extdeps.communication.medium { Lossless, Medium }
 import v2.compiler.name_resolve {
   Admission,
diff --git a/src/v2/test/claim/declaring_identity_spelling/production_ingest_test.dag b/src/v2/test/claim/declaring_identity_spelling/production_ingest_test.dag
index d333bde188c..9e4a3714dcd 100644
--- a/src/v2/test/claim/declaring_identity_spelling/production_ingest_test.dag
+++ b/src/v2/test/claim/declaring_identity_spelling/production_ingest_test.dag
@@ -26,7 +26,7 @@ import v2.std.cross_tree.import_model { V2Tree }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name {
   qualified_name_last_segment,
   qualified_name_snoc,
diff --git a/src/v2/test/claim/demand_engine/demand_engine_test.dag b/src/v2/test/claim/demand_engine/demand_engine_test.dag
index aae736364a5..01a03c3ab9c 100644
--- a/src/v2/test/claim/demand_engine/demand_engine_test.dag
+++ b/src/v2/test/claim/demand_engine/demand_engine_test.dag
@@ -36,7 +36,7 @@ import v2.std.demand_engine {
 }
 import v2.std.integer { Int }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 import std.cache_identity { parse_source_artifact_kind }
 import std.content_hash { Fnv1a64Structural }
diff --git a/src/v2/test/claim/demand_engine/native_demand_schedule_test.dag b/src/v2/test/claim/demand_engine/native_demand_schedule_test.dag
index aab898cf38f..d0cbee9a98e 100644
--- a/src/v2/test/claim/demand_engine/native_demand_schedule_test.dag
+++ b/src/v2/test/claim/demand_engine/native_demand_schedule_test.dag
@@ -15,7 +15,7 @@ import v2.std.demand_engine {
   demand_identity_key
 }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.algebra { Cons, Empty }
 import v2.std.text { String }
 import v2.compiler.compile {
diff --git a/src/v2/test/claim/effect_plan_bash_materialize_test.dag b/src/v2/test/claim/effect_plan_bash_materialize_test.dag
index fa8ba451528..9042622a729 100644
--- a/src/v2/test/claim/effect_plan_bash_materialize_test.dag
+++ b/src/v2/test/claim/effect_plan_bash_materialize_test.dag
@@ -24,7 +24,7 @@ import v2.std.operation_argv {
   operation_argv_bind_text,
   operation_argv_bind_text_list
 }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.orchestration {
   And,
   Continue,
diff --git a/src/v2/test/claim/emit/bool_literal_projection_emit_test.dag b/src/v2/test/claim/emit/bool_literal_projection_emit_test.dag
index 152508e869a..daea8afa1fc 100644
--- a/src/v2/test/claim/emit/bool_literal_projection_emit_test.dag
+++ b/src/v2/test/claim/emit/bool_literal_projection_emit_test.dag
@@ -46,7 +46,7 @@ import v2.std.compilers.target_model {
 }
 import v2.std.diagnostic { Accepted, None, Outcome, Rejected, outcome_rejected }
 import v2.std.node { Node, TypeNode, Atom, node_synthetic }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.text { String }
 
diff --git a/src/v2/test/claim/emit/dag_bind_let_block_scoped_test.dag b/src/v2/test/claim/emit/dag_bind_let_block_scoped_test.dag
index 576ac7b9210..3cabd8d55a5 100644
--- a/src/v2/test/claim/emit/dag_bind_let_block_scoped_test.dag
+++ b/src/v2/test/claim/emit/dag_bind_let_block_scoped_test.dag
@@ -19,7 +19,7 @@ import v2.std.compilers.lexing { Token }
 import v2.std.algebra { any, fold_list, length }
 import std.algebra { list_snoc_item }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/emit/dag_target_text_round_trip_test.dag b/src/v2/test/claim/emit/dag_target_text_round_trip_test.dag
index 40466e2de05..ff8e7d1994d 100644
--- a/src/v2/test/claim/emit/dag_target_text_round_trip_test.dag
+++ b/src/v2/test/claim/emit/dag_target_text_round_trip_test.dag
@@ -28,7 +28,7 @@ import v2.std.collection { Map, empty_map, map_insert }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/emit/module_member_emission_test.dag b/src/v2/test/claim/emit/module_member_emission_test.dag
index 9ad0fb075ee..dfcbd413d23 100644
--- a/src/v2/test/claim/emit/module_member_emission_test.dag
+++ b/src/v2/test/claim/emit/module_member_emission_test.dag
@@ -15,7 +15,7 @@ import v2.std.cross_tree.import_model { DagTree }
 import v2.std.diagnostic { Accepted, Rejected, diagnostics_fatal_reason }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Conj, Edge, Authored, Node, Symbol, TypeNode, node_synthetic, symbol_lexeme }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name { qualified_name_from_dotted_string }
 import v2.std.text { String }
 
diff --git a/src/v2/test/claim/emit/rust_bind_let_emit_test.dag b/src/v2/test/claim/emit/rust_bind_let_emit_test.dag
index 9b6dd8d03b3..d7b0babc8fe 100644
--- a/src/v2/test/claim/emit/rust_bind_let_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_bind_let_emit_test.dag
@@ -17,7 +17,7 @@ import v2.std.collection {
   empty_map,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_binop_emit_test.dag b/src/v2/test/claim/emit/rust_binop_emit_test.dag
index a68d748fc5d..b91f91c0fcc 100644
--- a/src/v2/test/claim/emit/rust_binop_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_binop_emit_test.dag
@@ -23,7 +23,7 @@ import v2.extdeps.languages.rust_test {
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_body_add_emit_test.dag b/src/v2/test/claim/emit/rust_body_add_emit_test.dag
index 31d1ec602a6..fc13cd6de74 100644
--- a/src/v2/test/claim/emit/rust_body_add_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_body_add_emit_test.dag
@@ -17,7 +17,7 @@ import v2.extdeps.languages.rust_test {
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_call_emit_test.dag b/src/v2/test/claim/emit/rust_call_emit_test.dag
index e9c41bb1cdb..8aa11a6e1aa 100644
--- a/src/v2/test/claim/emit/rust_call_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_call_emit_test.dag
@@ -1,7 +1,7 @@
 module v2.test.emit.rust_call_emit
 
 import std.occurrence_identity { OccurrenceSynthetic }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.arrow_signature { DeclaredSignatureEdges, declared_signature }
 import v2.compiler.emit { emit }
 import v2.compiler.infer { InferredFacts, InferredTree }
diff --git a/src/v2/test/claim/emit/rust_conditional_emit_test.dag b/src/v2/test/claim/emit/rust_conditional_emit_test.dag
index ef6b9c745d0..df7bcce21bc 100644
--- a/src/v2/test/claim/emit/rust_conditional_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_conditional_emit_test.dag
@@ -14,7 +14,7 @@ import extdeps.communication.medium { Medium }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_field_access_emit_test.dag b/src/v2/test/claim/emit/rust_field_access_emit_test.dag
index 78faf1afaf0..d6deca946c6 100644
--- a/src/v2/test/claim/emit/rust_field_access_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_field_access_emit_test.dag
@@ -18,7 +18,7 @@ import extdeps.communication.medium { Medium }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_fold_call_closure_emit_test.dag b/src/v2/test/claim/emit/rust_fold_call_closure_emit_test.dag
index 6b14a8f2a16..7cc1b457f87 100644
--- a/src/v2/test/claim/emit/rust_fold_call_closure_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_fold_call_closure_emit_test.dag
@@ -15,7 +15,7 @@ import extdeps.communication.medium { Medium }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_literal_bind_emit_test.dag b/src/v2/test/claim/emit/rust_literal_bind_emit_test.dag
index 0d7fc9b447b..0858a693126 100644
--- a/src/v2/test/claim/emit/rust_literal_bind_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_literal_bind_emit_test.dag
@@ -25,7 +25,7 @@ import extdeps.communication.medium { Medium }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_logic_complement_emit_test.dag b/src/v2/test/claim/emit/rust_logic_complement_emit_test.dag
index 96d7fc28efd..55c8ac43e3a 100644
--- a/src/v2/test/claim/emit/rust_logic_complement_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_logic_complement_emit_test.dag
@@ -14,7 +14,7 @@ import v2.extdeps.languages.rust_test {
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_logic_meet_join_emit_test.dag b/src/v2/test/claim/emit/rust_logic_meet_join_emit_test.dag
index 4073e4827b9..a52ccdfb0e4 100644
--- a/src/v2/test/claim/emit/rust_logic_meet_join_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_logic_meet_join_emit_test.dag
@@ -19,7 +19,7 @@ import v2.extdeps.languages.rust_test {
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_loop_emit_test.dag b/src/v2/test/claim/emit/rust_loop_emit_test.dag
index a5569b223c2..ff534feb782 100644
--- a/src/v2/test/claim/emit/rust_loop_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_loop_emit_test.dag
@@ -15,7 +15,7 @@ import extdeps.communication.medium { Medium }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_match_emit_test.dag b/src/v2/test/claim/emit/rust_match_emit_test.dag
index 817f64f6957..1f89b3e8360 100644
--- a/src/v2/test/claim/emit/rust_match_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_match_emit_test.dag
@@ -14,7 +14,7 @@ import extdeps.communication.medium { Medium }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_record_construct_emit_test.dag b/src/v2/test/claim/emit/rust_record_construct_emit_test.dag
index 1aff98603d1..bcaecd00d70 100644
--- a/src/v2/test/claim/emit/rust_record_construct_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_record_construct_emit_test.dag
@@ -15,7 +15,7 @@ import extdeps.communication.medium { Medium }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/rust_variant_construct_emit_test.dag b/src/v2/test/claim/emit/rust_variant_construct_emit_test.dag
index 3cdab1dc63d..9a879231327 100644
--- a/src/v2/test/claim/emit/rust_variant_construct_emit_test.dag
+++ b/src/v2/test/claim/emit/rust_variant_construct_emit_test.dag
@@ -14,7 +14,7 @@ import extdeps.communication.medium { Medium }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/emit/trait_derive_supplemental_generic_bound_contract_test.dag b/src/v2/test/claim/emit/trait_derive_supplemental_generic_bound_contract_test.dag
index 82f8a429d08..def3cbe8f6e 100644
--- a/src/v2/test/claim/emit/trait_derive_supplemental_generic_bound_contract_test.dag
+++ b/src/v2/test/claim/emit/trait_derive_supplemental_generic_bound_contract_test.dag
@@ -98,7 +98,7 @@ import v2.std.node {
   TypeNode,
   node_rebuild,
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/test/claim/emit/typescript_produced_decl_emit_test.dag b/src/v2/test/claim/emit/typescript_produced_decl_emit_test.dag
index 599ac9286a9..be15ff29aa1 100644
--- a/src/v2/test/claim/emit/typescript_produced_decl_emit_test.dag
+++ b/src/v2/test/claim/emit/typescript_produced_decl_emit_test.dag
@@ -46,7 +46,7 @@ import v2.std.node {
   node_subtree_nodes,
   node_synthetic
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node_query { binder_edge }
diff --git a/src/v2/test/claim/emitted_closure_crate_partition_test.dag b/src/v2/test/claim/emitted_closure_crate_partition_test.dag
index 276a2b9163f..4f5868da1cb 100644
--- a/src/v2/test/claim/emitted_closure_crate_partition_test.dag
+++ b/src/v2/test/claim/emitted_closure_crate_partition_test.dag
@@ -4,7 +4,7 @@ import std.types { Bool, Int, List, String }
 import v2.lens.module_graph { dependency_resolution_facts_live, module_declaration_facts_live }
 import v2.std.collection { map_get }
 import v2.std.diagnostic { Accepted, Rejected }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.compilers.compilation_unit {
   CompilationUnitId,
   HandExplicit,
diff --git a/src/v2/test/claim/execution/bind_round_trip_test.dag b/src/v2/test/claim/execution/bind_round_trip_test.dag
index 529ba1b2f8d..8816e29f113 100644
--- a/src/v2/test/claim/execution/bind_round_trip_test.dag
+++ b/src/v2/test/claim/execution/bind_round_trip_test.dag
@@ -19,7 +19,7 @@ import v2.std.cardinality { termination_proof_witness_for_node }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/branch_eval_by_execution_test.dag b/src/v2/test/claim/execution/branch_eval_by_execution_test.dag
index 5ab6e83f980..9465f6d68c2 100644
--- a/src/v2/test/claim/execution/branch_eval_by_execution_test.dag
+++ b/src/v2/test/claim/execution/branch_eval_by_execution_test.dag
@@ -25,7 +25,7 @@ import v2.std.collection {
   list_at_optional,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/execution/branch_if_then_else_round_trip_test.dag b/src/v2/test/claim/execution/branch_if_then_else_round_trip_test.dag
index 55528afab5f..c0dc8047c98 100644
--- a/src/v2/test/claim/execution/branch_if_then_else_round_trip_test.dag
+++ b/src/v2/test/claim/execution/branch_if_then_else_round_trip_test.dag
@@ -18,7 +18,7 @@ import v2.std.cardinality { termination_proof_witness_for_node }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/dag_add_emit_round_trip_test.dag b/src/v2/test/claim/execution/dag_add_emit_round_trip_test.dag
index e9d81e3c82f..416dc70f1d6 100644
--- a/src/v2/test/claim/execution/dag_add_emit_round_trip_test.dag
+++ b/src/v2/test/claim/execution/dag_add_emit_round_trip_test.dag
@@ -19,7 +19,7 @@ import v2.std.cardinality { termination_proof_witness_for_node }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/dag_binding_denotation_test.dag b/src/v2/test/claim/execution/dag_binding_denotation_test.dag
index 81d34ae9b9d..a4a216fad78 100644
--- a/src/v2/test/claim/execution/dag_binding_denotation_test.dag
+++ b/src/v2/test/claim/execution/dag_binding_denotation_test.dag
@@ -19,7 +19,7 @@ import v2.std.integer { Int, integer_int_type_node }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.logic { bool_node }
 import v2.std.node { Atom, Node, TypeNode, node_subtree_nodes }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/execution/dag_grammar_backward_round_trip_test.dag b/src/v2/test/claim/execution/dag_grammar_backward_round_trip_test.dag
index 040a504e342..99d31721b47 100644
--- a/src/v2/test/claim/execution/dag_grammar_backward_round_trip_test.dag
+++ b/src/v2/test/claim/execution/dag_grammar_backward_round_trip_test.dag
@@ -13,7 +13,7 @@ import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.node { Conj, Authored, Edge, Node, Symbol, TypeNode }
 import v2.std.node_query { NamedChildAmbiguous, NamedChildFound, NamedChildMissing, named_child_lookup }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/execution/data_decl_lowering_grounding_test.dag b/src/v2/test/claim/execution/data_decl_lowering_grounding_test.dag
index 741eb8ba676..eefa5af93c2 100644
--- a/src/v2/test/claim/execution/data_decl_lowering_grounding_test.dag
+++ b/src/v2/test/claim/execution/data_decl_lowering_grounding_test.dag
@@ -41,7 +41,7 @@ import v2.std.node {
   edge_is_core,
   StructuralLabel,
 }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.algebra { fold_list }
 import v2.std.text { String }
 
diff --git a/src/v2/test/claim/execution/effect_io_eval_by_execution_test.dag b/src/v2/test/claim/execution/effect_io_eval_by_execution_test.dag
index 53dd7dbb240..cf3ad156ede 100644
--- a/src/v2/test/claim/execution/effect_io_eval_by_execution_test.dag
+++ b/src/v2/test/claim/execution/effect_io_eval_by_execution_test.dag
@@ -29,7 +29,7 @@ import v2.std.cardinality { RankingComponent, TerminationProof }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/emit_host_add_equals_eval_test.dag b/src/v2/test/claim/execution/emit_host_add_equals_eval_test.dag
index fae22e42270..c85bc1db3c0 100644
--- a/src/v2/test/claim/execution/emit_host_add_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/emit_host_add_equals_eval_test.dag
@@ -28,7 +28,7 @@ import v2.std.collection {
   Map,
   list_nth
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/test/claim/execution/emit_host_complement_equals_eval_test.dag b/src/v2/test/claim/execution/emit_host_complement_equals_eval_test.dag
index 23e8c8fb024..e2e450e1e22 100644
--- a/src/v2/test/claim/execution/emit_host_complement_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/emit_host_complement_equals_eval_test.dag
@@ -28,7 +28,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/execution/emit_host_field_access_equals_eval_test.dag b/src/v2/test/claim/execution/emit_host_field_access_equals_eval_test.dag
index 55b21fdcbca..bafb09d6bc2 100644
--- a/src/v2/test/claim/execution/emit_host_field_access_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/emit_host_field_access_equals_eval_test.dag
@@ -28,7 +28,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/execution/emit_host_fold_closure_equals_eval_test.dag b/src/v2/test/claim/execution/emit_host_fold_closure_equals_eval_test.dag
index ad160365791..b6cbf4cf28c 100644
--- a/src/v2/test/claim/execution/emit_host_fold_closure_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/emit_host_fold_closure_equals_eval_test.dag
@@ -27,7 +27,7 @@ import v2.std.collection {
   list_at_optional,
   list_nth
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/emit_host_identity_cast_native_test.dag b/src/v2/test/claim/execution/emit_host_identity_cast_native_test.dag
index 74053d27083..cc4924013b3 100644
--- a/src/v2/test/claim/execution/emit_host_identity_cast_native_test.dag
+++ b/src/v2/test/claim/execution/emit_host_identity_cast_native_test.dag
@@ -9,7 +9,7 @@ import v2.std.diagnostic { Accepted, None, Rejected }
 import v2.std.host_run { EmitHostRunReceipt, HostLogicalRun }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, node_synthetic }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import v2.std.witness { Violates }
 import v2.test.claim.coercion.identity_cast_emission_route {
diff --git a/src/v2/test/claim/execution/emit_host_loop_equals_eval_test.dag b/src/v2/test/claim/execution/emit_host_loop_equals_eval_test.dag
index 382c8c5f655..5770edc141f 100644
--- a/src/v2/test/claim/execution/emit_host_loop_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/emit_host_loop_equals_eval_test.dag
@@ -30,7 +30,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/emit_host_match_equals_eval_test.dag b/src/v2/test/claim/execution/emit_host_match_equals_eval_test.dag
index ae406ceaae6..b7e7e557ff3 100644
--- a/src/v2/test/claim/execution/emit_host_match_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/emit_host_match_equals_eval_test.dag
@@ -38,7 +38,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/emit_host_meet_join_equals_eval_test.dag b/src/v2/test/claim/execution/emit_host_meet_join_equals_eval_test.dag
index 97864a293fd..ce7e332aeaf 100644
--- a/src/v2/test/claim/execution/emit_host_meet_join_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/emit_host_meet_join_equals_eval_test.dag
@@ -34,7 +34,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/execution/emit_host_variant_construct_equals_eval_test.dag b/src/v2/test/claim/execution/emit_host_variant_construct_equals_eval_test.dag
index 96bee87c7d0..55e2a0f2e4b 100644
--- a/src/v2/test/claim/execution/emit_host_variant_construct_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/emit_host_variant_construct_equals_eval_test.dag
@@ -26,7 +26,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/execution/emit_on_demand_family_crate_witness_test.dag b/src/v2/test/claim/execution/emit_on_demand_family_crate_witness_test.dag
index aeeda17e414..d3b18173bd8 100644
--- a/src/v2/test/claim/execution/emit_on_demand_family_crate_witness_test.dag
+++ b/src/v2/test/claim/execution/emit_on_demand_family_crate_witness_test.dag
@@ -53,7 +53,7 @@ import v2.test.execution.emit_host_complement_equals_eval {
 }
 import v2.std.algebra { Cons, Empty, length }
 import std.algebra { Cons, Empty, list_append }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent
diff --git a/src/v2/test/claim/execution/emit_on_demand_match_loop_fold_family_witness_test.dag b/src/v2/test/claim/execution/emit_on_demand_match_loop_fold_family_witness_test.dag
index cd2d654152b..f6dfa9cc6b6 100644
--- a/src/v2/test/claim/execution/emit_on_demand_match_loop_fold_family_witness_test.dag
+++ b/src/v2/test/claim/execution/emit_on_demand_match_loop_fold_family_witness_test.dag
@@ -73,7 +73,7 @@ import v2.test.emit.fold_call_closure_fixture {
   fold_fixture_param_canonical_arrow,
   fold_fixture_param_wrong_arrow,
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/infer_atom_grounding_rules_test.dag b/src/v2/test/claim/execution/infer_atom_grounding_rules_test.dag
index 9910c23d200..9a366ce5df3 100644
--- a/src/v2/test/claim/execution/infer_atom_grounding_rules_test.dag
+++ b/src/v2/test/claim/execution/infer_atom_grounding_rules_test.dag
@@ -37,7 +37,7 @@ import v2.std.node {
   TypeNode,
   node_subtree_nodes
 }
-import v2.std.optional { Absent, optional_present, Present }
+import std.optional { Absent, optional_present, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/execution/infer_declaration_formation_test.dag b/src/v2/test/claim/execution/infer_declaration_formation_test.dag
index 51bd4b56bc8..8e4c3194fce 100644
--- a/src/v2/test/claim/execution/infer_declaration_formation_test.dag
+++ b/src/v2/test/claim/execution/infer_declaration_formation_test.dag
@@ -6,7 +6,7 @@ import v2.compiler.refinement_discharge { infer_and_discharge }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Conj, Disj, Authored, Node, Positional, Symbol, TypeNode, node_subtree_nodes, StructuralLabel }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.witness { Holds, Violates }
 import v2.std.type_binder { node_inferred_subtree_nodes }
 import v2.test.claim.type_param_binder_frame { tpb_assemble }
diff --git a/src/v2/test/claim/execution/infer_product_introduction_test.dag b/src/v2/test/claim/execution/infer_product_introduction_test.dag
index f1eb889eaad..aa8f446d4f8 100644
--- a/src/v2/test/claim/execution/infer_product_introduction_test.dag
+++ b/src/v2/test/claim/execution/infer_product_introduction_test.dag
@@ -42,7 +42,7 @@ import v2.std.node {
 }
 import v2.std.text { String }
 import std.algebra { list_snoc_item }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 import v2.std.node_query { BinderParts, binder_node_parts }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/execution/long/add_arrow_eval_by_execution_test.dag b/src/v2/test/claim/execution/long/add_arrow_eval_by_execution_test.dag
index a947f28c3a3..7b976c84706 100644
--- a/src/v2/test/claim/execution/long/add_arrow_eval_by_execution_test.dag
+++ b/src/v2/test/claim/execution/long/add_arrow_eval_by_execution_test.dag
@@ -38,7 +38,7 @@ import v2.std.collection {
   list_at_optional,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/test/claim/execution/long/bind_eval_by_execution_test.dag b/src/v2/test/claim/execution/long/bind_eval_by_execution_test.dag
index 0fc8f2678ed..dfef88bed2c 100644
--- a/src/v2/test/claim/execution/long/bind_eval_by_execution_test.dag
+++ b/src/v2/test/claim/execution/long/bind_eval_by_execution_test.dag
@@ -27,7 +27,7 @@ import v2.std.collection {
   list_at_optional,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/execution/long/emit_host_classical_not_ingested_equals_eval_test.dag b/src/v2/test/claim/execution/long/emit_host_classical_not_ingested_equals_eval_test.dag
index df1830ce0bd..976bf823584 100644
--- a/src/v2/test/claim/execution/long/emit_host_classical_not_ingested_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/long/emit_host_classical_not_ingested_equals_eval_test.dag
@@ -42,7 +42,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/test/claim/execution/long/loop_eval_by_execution_test.dag b/src/v2/test/claim/execution/long/loop_eval_by_execution_test.dag
index 1e7f487dbe6..570de5efe3b 100644
--- a/src/v2/test/claim/execution/long/loop_eval_by_execution_test.dag
+++ b/src/v2/test/claim/execution/long/loop_eval_by_execution_test.dag
@@ -27,7 +27,7 @@ import v2.std.collection {
   list_at_optional,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/execution/long/pick_ingested_structural_lowering_test.dag b/src/v2/test/claim/execution/long/pick_ingested_structural_lowering_test.dag
index dcb4c5202a6..b060affc755 100644
--- a/src/v2/test/claim/execution/long/pick_ingested_structural_lowering_test.dag
+++ b/src/v2/test/claim/execution/long/pick_ingested_structural_lowering_test.dag
@@ -27,7 +27,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/test/claim/execution/loop_round_trip_test.dag b/src/v2/test/claim/execution/loop_round_trip_test.dag
index f7003b02808..7c9e74863ec 100644
--- a/src/v2/test/claim/execution/loop_round_trip_test.dag
+++ b/src/v2/test/claim/execution/loop_round_trip_test.dag
@@ -22,7 +22,7 @@ import v2.std.cardinality {
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/match_bool_round_trip_test.dag b/src/v2/test/claim/execution/match_bool_round_trip_test.dag
index 1d8ed8bd016..d01b5298330 100644
--- a/src/v2/test/claim/execution/match_bool_round_trip_test.dag
+++ b/src/v2/test/claim/execution/match_bool_round_trip_test.dag
@@ -17,7 +17,7 @@ import v2.std.cardinality { termination_proof_witness_for_node }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/native_selected_witness_bundle_test.dag b/src/v2/test/claim/execution/native_selected_witness_bundle_test.dag
index 6b969c514bf..a4cbb3e4c15 100644
--- a/src/v2/test/claim/execution/native_selected_witness_bundle_test.dag
+++ b/src/v2/test/claim/execution/native_selected_witness_bundle_test.dag
@@ -85,7 +85,7 @@ import v2.std.host_transport { ByteString }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
 import v2.std.machine { Byte }
 import v2.std.node { Node }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.runtime { RuntimeValue }
 import v2.test.execution.emit_host_complement_equals_eval {
   emit_complement_eval_bool_false,
diff --git a/src/v2/test/claim/execution/rust_emit_host_call_equals_eval_test.dag b/src/v2/test/claim/execution/rust_emit_host_call_equals_eval_test.dag
index 30a6fbb8152..65604398449 100644
--- a/src/v2/test/claim/execution/rust_emit_host_call_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/rust_emit_host_call_equals_eval_test.dag
@@ -28,7 +28,7 @@ import v2.std.cardinality { RankingComponent, TerminationProof }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/rust_record_construct_emit_host_equals_eval_test.dag b/src/v2/test/claim/execution/rust_record_construct_emit_host_equals_eval_test.dag
index 5f3af2f9692..f60261b773d 100644
--- a/src/v2/test/claim/execution/rust_record_construct_emit_host_equals_eval_test.dag
+++ b/src/v2/test/claim/execution/rust_record_construct_emit_host_equals_eval_test.dag
@@ -33,7 +33,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/execution/self_host_candidate_generation_test.dag b/src/v2/test/claim/execution/self_host_candidate_generation_test.dag
index 792f20faf41..e914a9d3d8c 100644
--- a/src/v2/test/claim/execution/self_host_candidate_generation_test.dag
+++ b/src/v2/test/claim/execution/self_host_candidate_generation_test.dag
@@ -7,7 +7,7 @@ import v2.compiler.self_host.candidate_generation {
 }
 import v2.compiler.translate { translate_diagnostic_reason_from_symbol, translate_diagnostic_reason_roster, translate_diagnostic_reason_symbol, translate_diagnostic_reason_variants }
 import v2.compiler.target_serialize { target_serialize_source_from_model, TargetBundleDuplicateEdge, TargetBundleMalformed, TranslateDiagnosticReason }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/test/claim/extdeps/spice_element_letter_test.dag b/src/v2/test/claim/extdeps/spice_element_letter_test.dag
index 4b5e42d2ba8..a636e042d39 100644
--- a/src/v2/test/claim/extdeps/spice_element_letter_test.dag
+++ b/src/v2/test/claim/extdeps/spice_element_letter_test.dag
@@ -16,7 +16,7 @@ import v2.extdeps.formats.spice {
   spice_identifier,
   spice_identifier_is_admissible,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/field_projection/field_projection_stages_test.dag b/src/v2/test/claim/field_projection/field_projection_stages_test.dag
index c07066e5977..821afe59906 100644
--- a/src/v2/test/claim/field_projection/field_projection_stages_test.dag
+++ b/src/v2/test/claim/field_projection/field_projection_stages_test.dag
@@ -43,7 +43,7 @@ import v2.std.integer { Int, integer_int_to_signed_i32_le_bytes, integer_signed_
 import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.witness { Holds, Violates }
 import v2.std.node { NodeFold, fold_node }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.test.lens_common.infer_fixture {
   ClaimParam,
   ClaimRecord,
diff --git a/src/v2/test/claim/fold_encoding_test.dag b/src/v2/test/claim/fold_encoding_test.dag
index dc6ae1f19b6..9b023b2279f 100644
--- a/src/v2/test/claim/fold_encoding_test.dag
+++ b/src/v2/test/claim/fold_encoding_test.dag
@@ -4,7 +4,7 @@ import std.algebra { Empty }
 import v2.std.anonymous_binder { is_fold_carrier_binder }
 import v2.compiler.reference_conservation_admission { conserved_normalize_of_text, no_explained_drops }
 import v2.extdeps.languages.dag { qualified_name_from_module_node }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/generated/cross_representation_equality.dag b/src/v2/test/claim/generated/cross_representation_equality.dag
index 82f0dd1d510..7bb4813099f 100644
--- a/src/v2/test/claim/generated/cross_representation_equality.dag
+++ b/src/v2/test/claim/generated/cross_representation_equality.dag
@@ -98,7 +98,7 @@ fn witness_cross_representation_roster_covers_bool() -> Bool {
 fn witness_cross_representation_roster_covers_optional_null() -> Bool {
   roster_covers_genuine_straddle(
     modeled_ref: DeclarationRef {
-      module_path: "v2.std.optional",
+      module_path: "std.optional",
       decl_name: "Optional",
       field: WholeDeclaration
     },
diff --git a/src/v2/test/claim/infer_list_introduction_test.dag b/src/v2/test/claim/infer_list_introduction_test.dag
index 8ba88a3f2ae..4a53e57136e 100644
--- a/src/v2/test/claim/infer_list_introduction_test.dag
+++ b/src/v2/test/claim/infer_list_introduction_test.dag
@@ -11,7 +11,7 @@ import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { ComputationNode, Edge, Instantiation, Node, Positional, Transform, TypeNode, symbol_lexeme }
 import v2.std.node_query { node_positional_child_targets }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.logic { bool_node }
 import v2.std.exact_structural_equality_zip_fold_predicate { exact_structural_equality_zip_fold }
 import v2.std.collection { list_at_optional }
diff --git a/src/v2/test/claim/infer_self_grounding_wall_test.dag b/src/v2/test/claim/infer_self_grounding_wall_test.dag
index 8d1d4043a97..e82acad384a 100644
--- a/src/v2/test/claim/infer_self_grounding_wall_test.dag
+++ b/src/v2/test/claim/infer_self_grounding_wall_test.dag
@@ -37,7 +37,7 @@ import v2.compiler.infer { canonical_grounding_for_node, canonical_grounding_fro
 import v2.extdeps.languages.dag { dag_int_literal_fixture_one, dag_pick_if_body_fixture }
 import std.algebra { list_snoc_item }
 import v2.std.diagnostic { Accepted, Rejected, Some, None, NonEmptyDiagnostics, diagnostics_fatal_reason }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
 import v2.std.node {
   Node,
diff --git a/src/v2/test/claim/manual/add_body_emit_typescript_test.dag b/src/v2/test/claim/manual/add_body_emit_typescript_test.dag
index 2f204a76c51..20e35fbd1c0 100644
--- a/src/v2/test/claim/manual/add_body_emit_typescript_test.dag
+++ b/src/v2/test/claim/manual/add_body_emit_typescript_test.dag
@@ -50,7 +50,7 @@ import v2.std.collection {
   Map,
   empty_map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/bash_emit_command_test.dag b/src/v2/test/claim/manual/bash_emit_command_test.dag
index 88fdee27be9..0e547515a1b 100644
--- a/src/v2/test/claim/manual/bash_emit_command_test.dag
+++ b/src/v2/test/claim/manual/bash_emit_command_test.dag
@@ -61,7 +61,7 @@ import v2.std.collection {
   Map,
   empty_map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/bind_demand_driven_eval_test.dag b/src/v2/test/claim/manual/bind_demand_driven_eval_test.dag
index 4df9a2ef677..64b708f8015 100644
--- a/src/v2/test/claim/manual/bind_demand_driven_eval_test.dag
+++ b/src/v2/test/claim/manual/bind_demand_driven_eval_test.dag
@@ -31,7 +31,7 @@ import v2.std.collection {
   map_get,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/manual/bind_emit_test.dag b/src/v2/test/claim/manual/bind_emit_test.dag
index c6c543c87a3..36acb972539 100644
--- a/src/v2/test/claim/manual/bind_emit_test.dag
+++ b/src/v2/test/claim/manual/bind_emit_test.dag
@@ -22,7 +22,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional
 }
 import v2.std.diagnostic {
diff --git a/src/v2/test/claim/manual/body_lowering_match_test.dag b/src/v2/test/claim/manual/body_lowering_match_test.dag
index 453cdcc64a5..f9ff2efbbeb 100644
--- a/src/v2/test/claim/manual/body_lowering_match_test.dag
+++ b/src/v2/test/claim/manual/body_lowering_match_test.dag
@@ -16,7 +16,7 @@ import v2.extdeps.languages.dag {
 }
 import std.algebra { Empty }
 import v2.std.algebra { length }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/test/claim/manual/body_lowering_normalize_add_test.dag b/src/v2/test/claim/manual/body_lowering_normalize_add_test.dag
index 8f6efee2b87..ae281932dac 100644
--- a/src/v2/test/claim/manual/body_lowering_normalize_add_test.dag
+++ b/src/v2/test/claim/manual/body_lowering_normalize_add_test.dag
@@ -26,7 +26,7 @@ import std.algebra { Cons, Empty }
 import v2.std.collection {
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/test/claim/manual/body_lowering_projection_call_test.dag b/src/v2/test/claim/manual/body_lowering_projection_call_test.dag
index 0b6272f2113..8ffe87dd37c 100644
--- a/src/v2/test/claim/manual/body_lowering_projection_call_test.dag
+++ b/src/v2/test/claim/manual/body_lowering_projection_call_test.dag
@@ -11,7 +11,7 @@ import v2.extdeps.languages.dag {
   dag_language_model,
   parse_production_emitted_identity_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/test/claim/manual/branch_if_then_else_emit_test.dag b/src/v2/test/claim/manual/branch_if_then_else_emit_test.dag
index 2c402691310..cb37137927a 100644
--- a/src/v2/test/claim/manual/branch_if_then_else_emit_test.dag
+++ b/src/v2/test/claim/manual/branch_if_then_else_emit_test.dag
@@ -26,7 +26,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent
diff --git a/src/v2/test/claim/manual/branch_lazy_arm_eval_acceptance_test.dag b/src/v2/test/claim/manual/branch_lazy_arm_eval_acceptance_test.dag
index 3a9deffbd2e..54f891e64a4 100644
--- a/src/v2/test/claim/manual/branch_lazy_arm_eval_acceptance_test.dag
+++ b/src/v2/test/claim/manual/branch_lazy_arm_eval_acceptance_test.dag
@@ -28,7 +28,7 @@ import v2.std.collection {
   map_get,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/manual/c_add_emit_translate_test.dag b/src/v2/test/claim/manual/c_add_emit_translate_test.dag
index e371eb25d00..c6c5725a3f1 100644
--- a/src/v2/test/claim/manual/c_add_emit_translate_test.dag
+++ b/src/v2/test/claim/manual/c_add_emit_translate_test.dag
@@ -24,7 +24,7 @@ import v2.std.collection {
   Map,
   empty_map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/cpp_add_emit_translate_test.dag b/src/v2/test/claim/manual/cpp_add_emit_translate_test.dag
index e2754b94844..37e4dd2dbad 100644
--- a/src/v2/test/claim/manual/cpp_add_emit_translate_test.dag
+++ b/src/v2/test/claim/manual/cpp_add_emit_translate_test.dag
@@ -48,7 +48,7 @@ import v2.std.collection {
   Map,
   empty_map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/dissolution_subsumption_reverification.dag b/src/v2/test/claim/manual/dissolution_subsumption_reverification.dag
index 9ec13e002d4..f1199b66ffb 100644
--- a/src/v2/test/claim/manual/dissolution_subsumption_reverification.dag
+++ b/src/v2/test/claim/manual/dissolution_subsumption_reverification.dag
@@ -28,7 +28,7 @@ import v2.std.collection {
   Map,
   PointwisePower
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/emit_directive_bash_test.dag b/src/v2/test/claim/manual/emit_directive_bash_test.dag
index f489e511ddb..d60ed46909d 100644
--- a/src/v2/test/claim/manual/emit_directive_bash_test.dag
+++ b/src/v2/test/claim/manual/emit_directive_bash_test.dag
@@ -11,7 +11,7 @@ import v2.extdeps.languages.bash {
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/emit_directive_gha_test.dag b/src/v2/test/claim/manual/emit_directive_gha_test.dag
index febf95d9e89..5517af3efb9 100644
--- a/src/v2/test/claim/manual/emit_directive_gha_test.dag
+++ b/src/v2/test/claim/manual/emit_directive_gha_test.dag
@@ -11,7 +11,7 @@ import v2.extdeps.github.diagnostic_emit { emit_directive_gha_target_model }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/emit_directive_rust_test.dag b/src/v2/test/claim/manual/emit_directive_rust_test.dag
index 14e45c1c443..3ffcb85cc8f 100644
--- a/src/v2/test/claim/manual/emit_directive_rust_test.dag
+++ b/src/v2/test/claim/manual/emit_directive_rust_test.dag
@@ -14,7 +14,7 @@ import v2.extdeps.languages.bash {
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/english_emit_add_test.dag b/src/v2/test/claim/manual/english_emit_add_test.dag
index 3d2743856db..b4ffe91c89b 100644
--- a/src/v2/test/claim/manual/english_emit_add_test.dag
+++ b/src/v2/test/claim/manual/english_emit_add_test.dag
@@ -22,7 +22,7 @@ import v2.std.cardinality { termination_proof_witness_for_node }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/eval_runtime.dag b/src/v2/test/claim/manual/eval_runtime.dag
index 774f8692a8d..45074c30c11 100644
--- a/src/v2/test/claim/manual/eval_runtime.dag
+++ b/src/v2/test/claim/manual/eval_runtime.dag
@@ -24,7 +24,7 @@ import v2.std.collection {
   empty_map,
   list_nth
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/field_access_emit_test.dag b/src/v2/test/claim/manual/field_access_emit_test.dag
index f39ac94725a..163d54899dc 100644
--- a/src/v2/test/claim/manual/field_access_emit_test.dag
+++ b/src/v2/test/claim/manual/field_access_emit_test.dag
@@ -20,7 +20,7 @@ import v2.std.cardinality { termination_proof_witness_for_node }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/go_add_emit_translate_test.dag b/src/v2/test/claim/manual/go_add_emit_translate_test.dag
index 8aaf94a8554..35d03876949 100644
--- a/src/v2/test/claim/manual/go_add_emit_translate_test.dag
+++ b/src/v2/test/claim/manual/go_add_emit_translate_test.dag
@@ -50,7 +50,7 @@ import v2.std.collection {
   Map,
   empty_map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/infer_algebra_ref_grounding_anchor.dag b/src/v2/test/claim/manual/infer_algebra_ref_grounding_anchor.dag
index 5bd6ec6af97..7dd426f9557 100644
--- a/src/v2/test/claim/manual/infer_algebra_ref_grounding_anchor.dag
+++ b/src/v2/test/claim/manual/infer_algebra_ref_grounding_anchor.dag
@@ -1,5 +1,5 @@
 module v2.test.manual.infer_algebra_ref_grounding_anchor
-import v2.std.optional { optional_absent }
+import std.optional { optional_absent }
 
 import v2.std.witness { Holds, Violates, Witness }
 import v2.compiler.infer { algebra_ref_is_grounded, canonical_grounding_from_inferred_facts }
diff --git a/src/v2/test/claim/manual/int_literal_parse_smoke_test.dag b/src/v2/test/claim/manual/int_literal_parse_smoke_test.dag
index efc80f2257f..717337f5d82 100644
--- a/src/v2/test/claim/manual/int_literal_parse_smoke_test.dag
+++ b/src/v2/test/claim/manual/int_literal_parse_smoke_test.dag
@@ -9,7 +9,7 @@ import v2.extdeps.languages.dag {
   dag_language_model
 }
 import v2.std.compilers.lexing { token_stream_all, token_stream_first }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/test/claim/manual/loop_demand_driven_eval_test.dag b/src/v2/test/claim/manual/loop_demand_driven_eval_test.dag
index 32f9ced2c8d..d0f82a86efd 100644
--- a/src/v2/test/claim/manual/loop_demand_driven_eval_test.dag
+++ b/src/v2/test/claim/manual/loop_demand_driven_eval_test.dag
@@ -26,7 +26,7 @@ import v2.std.cardinality {
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/loop_emit_test.dag b/src/v2/test/claim/manual/loop_emit_test.dag
index cebc7caa50f..5035d3d7a84 100644
--- a/src/v2/test/claim/manual/loop_emit_test.dag
+++ b/src/v2/test/claim/manual/loop_emit_test.dag
@@ -21,7 +21,7 @@ import v2.compiler.target_serialize { target_serialize_source_from_model }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional
 }
 import v2.std.diagnostic {
diff --git a/src/v2/test/claim/manual/match_bool_emit_test.dag b/src/v2/test/claim/manual/match_bool_emit_test.dag
index eeee16cf45c..c65c574e591 100644
--- a/src/v2/test/claim/manual/match_bool_emit_test.dag
+++ b/src/v2/test/claim/manual/match_bool_emit_test.dag
@@ -26,7 +26,7 @@ import v2.std.collection {
   Map,
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent
diff --git a/src/v2/test/claim/manual/python_add_emit_translate_test.dag b/src/v2/test/claim/manual/python_add_emit_translate_test.dag
index 7f82e19b4ef..c61d3617e0c 100644
--- a/src/v2/test/claim/manual/python_add_emit_translate_test.dag
+++ b/src/v2/test/claim/manual/python_add_emit_translate_test.dag
@@ -43,7 +43,7 @@ import v2.std.collection {
   Map,
   empty_map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/record_construct_emit_test.dag b/src/v2/test/claim/manual/record_construct_emit_test.dag
index 3ef587964d7..c5534aefbcf 100644
--- a/src/v2/test/claim/manual/record_construct_emit_test.dag
+++ b/src/v2/test/claim/manual/record_construct_emit_test.dag
@@ -20,7 +20,7 @@ import v2.std.cardinality { termination_proof_witness_for_node }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/runtime_run_test.dag b/src/v2/test/claim/manual/runtime_run_test.dag
index 280ad0170bf..c2089989690 100644
--- a/src/v2/test/claim/manual/runtime_run_test.dag
+++ b/src/v2/test/claim/manual/runtime_run_test.dag
@@ -13,7 +13,7 @@ import v2.std.cardinality { RankingComponent, TerminationProof }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/rust_add_emit_translate_test.dag b/src/v2/test/claim/manual/rust_add_emit_translate_test.dag
index 16a4de06285..1abd47de3b1 100644
--- a/src/v2/test/claim/manual/rust_add_emit_translate_test.dag
+++ b/src/v2/test/claim/manual/rust_add_emit_translate_test.dag
@@ -54,7 +54,7 @@ import v2.std.collection {
   Map,
   empty_map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/sg2_mode2_non_grammar_emit_test.dag b/src/v2/test/claim/manual/sg2_mode2_non_grammar_emit_test.dag
index 64dfc6e9e5b..4e71e5e4a65 100644
--- a/src/v2/test/claim/manual/sg2_mode2_non_grammar_emit_test.dag
+++ b/src/v2/test/claim/manual/sg2_mode2_non_grammar_emit_test.dag
@@ -25,7 +25,7 @@ import v2.std.algebra { is_empty }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Absent,
   Present,
diff --git a/src/v2/test/claim/manual/typescript_add_emit_translate_test.dag b/src/v2/test/claim/manual/typescript_add_emit_translate_test.dag
index d0124fc30ff..604d7809670 100644
--- a/src/v2/test/claim/manual/typescript_add_emit_translate_test.dag
+++ b/src/v2/test/claim/manual/typescript_add_emit_translate_test.dag
@@ -45,7 +45,7 @@ import v2.std.collection {
   Map,
   empty_map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/typescript_pr3_typed_fn_translate_test.dag b/src/v2/test/claim/manual/typescript_pr3_typed_fn_translate_test.dag
index 3cd726091c3..4117f17bf30 100644
--- a/src/v2/test/claim/manual/typescript_pr3_typed_fn_translate_test.dag
+++ b/src/v2/test/claim/manual/typescript_pr3_typed_fn_translate_test.dag
@@ -29,7 +29,7 @@ import v2.std.collection {
   Map,
   empty_map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/typescript_record_task_translate_test.dag b/src/v2/test/claim/manual/typescript_record_task_translate_test.dag
index b4bd4687d15..eb86a1c3614 100644
--- a/src/v2/test/claim/manual/typescript_record_task_translate_test.dag
+++ b/src/v2/test/claim/manual/typescript_record_task_translate_test.dag
@@ -30,7 +30,7 @@ import v2.std.collection {
   Map,
   empty_map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/manual/value_null_split_witness_test.dag b/src/v2/test/claim/manual/value_null_split_witness_test.dag
index 6cf25912104..2f7f12de851 100644
--- a/src/v2/test/claim/manual/value_null_split_witness_test.dag
+++ b/src/v2/test/claim/manual/value_null_split_witness_test.dag
@@ -4,7 +4,7 @@ import v2.std.live_tree { LiveTreeDisposition }
 import v2.lens.testgen { cross_repr_native_value_null }
 import v2.std.collection { empty_map, map_insert }
 import v2.std.diagnostic { Accepted, Rejected }
-import v2.std.optional {
+import std.optional {
   Absent,
   Present,
   optional_absent,
diff --git a/src/v2/test/claim/map_carrier_shape_gate_test.dag b/src/v2/test/claim/map_carrier_shape_gate_test.dag
index 47a012bf5af..6c3dea3e924 100644
--- a/src/v2/test/claim/map_carrier_shape_gate_test.dag
+++ b/src/v2/test/claim/map_carrier_shape_gate_test.dag
@@ -22,7 +22,7 @@ import v2.std.collection {
   map_insert,
   map_lookup,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/match_arm_binder_frame_test.dag b/src/v2/test/claim/match_arm_binder_frame_test.dag
index 96b019c8757..583429fa7bc 100644
--- a/src/v2/test/claim/match_arm_binder_frame_test.dag
+++ b/src/v2/test/claim/match_arm_binder_frame_test.dag
@@ -24,7 +24,7 @@ import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Node, TypeNode, node_subtree_nodes }
 import v2.std.text { String }
 import v2.std.qualified_name { declaration_reference_path_optional, qualified_name_last_segment }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/match_binder/match_binder_typing_test.dag b/src/v2/test/claim/match_binder/match_binder_typing_test.dag
index 41c321c759e..bdece9299d3 100644
--- a/src/v2/test/claim/match_binder/match_binder_typing_test.dag
+++ b/src/v2/test/claim/match_binder/match_binder_typing_test.dag
@@ -53,7 +53,7 @@ import std.occurrence_identity { OccurrenceSynthetic }
 import std.types { List }
 import v2.std.collection { empty_map }
 import v2.std.integer { Int }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 data mbp_artifact: Artifact = Artifact {
diff --git a/src/v2/test/claim/name_resolve/arrow_domain_is_first_positional_test.dag b/src/v2/test/claim/name_resolve/arrow_domain_is_first_positional_test.dag
index 706addae4be..84355b6d9ff 100644
--- a/src/v2/test/claim/name_resolve/arrow_domain_is_first_positional_test.dag
+++ b/src/v2/test/claim/name_resolve/arrow_domain_is_first_positional_test.dag
@@ -6,7 +6,7 @@ import v2.compiler.symbol_index_fill { symbol_index_fill_containment_node }
 import v2.std.symbol_index { empty_symbol_index, symbol_index_lookup }
 import v2.std.qualified_name { qualified_name_from_dotted_string }
 import v2.std.collection { map_lookup }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.node { Arrow, Atom, Conj, Edge, Authored, Node, Positional, Symbol, TypeNode }
 import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.node_query { binder_edge }
diff --git a/src/v2/test/claim/name_resolve/explicit_fn_import_binds_test.dag b/src/v2/test/claim/name_resolve/explicit_fn_import_binds_test.dag
index 4275f32a707..ec78dec30a4 100644
--- a/src/v2/test/claim/name_resolve/explicit_fn_import_binds_test.dag
+++ b/src/v2/test/claim/name_resolve/explicit_fn_import_binds_test.dag
@@ -16,7 +16,7 @@ import v2.std.artifact { Artifact, SourceFile }
 import v2.std.cross_tree.import_model { DagTree }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name { QualifiedName }
 import v2.std.text { String }
 import extdeps.communication.medium { Lossless, Medium }
diff --git a/src/v2/test/claim/namespace_graft/inline_record_field_test.dag b/src/v2/test/claim/namespace_graft/inline_record_field_test.dag
index 2c15b58b9c4..0d71026dfb0 100644
--- a/src/v2/test/claim/namespace_graft/inline_record_field_test.dag
+++ b/src/v2/test/claim/namespace_graft/inline_record_field_test.dag
@@ -7,7 +7,7 @@ import v2.test.parse.supplied_token_stream_support { supplied_stream_matches_tok
 import v2.std.compilers.lexing { Token, TokenStream, token_stream_new }
 import v2.std.symbol_index { SymbolIndex, empty_symbol_index, symbol_index_lookup }
 import v2.std.diagnostic { Accepted, Rejected, bind_outcome }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.node { Symbol, symbol_intern_lexeme }
 import v2.std.text { String }
 import std.algebra { Cons, Empty, FreeMonoid }
diff --git a/src/v2/test/claim/namespace_graft/normalize_graft_witness_helpers.dag b/src/v2/test/claim/namespace_graft/normalize_graft_witness_helpers.dag
index 4159361201f..882053c414e 100644
--- a/src/v2/test/claim/namespace_graft/normalize_graft_witness_helpers.dag
+++ b/src/v2/test/claim/namespace_graft/normalize_graft_witness_helpers.dag
@@ -4,7 +4,7 @@ import v2.compiler.normalize { normalize }
 import v2.compiler.parse { parse_module }
 import v2.compiler.tokenize { tokenize }
 import v2.extdeps.languages.dag { dag_language_model, qualified_name_from_graft_spine }
-import v2.std.optional {
+import std.optional {
   Absent,
   Present
 }
diff --git a/src/v2/test/claim/namespace_xl0/body_shape_contract_test.dag b/src/v2/test/claim/namespace_xl0/body_shape_contract_test.dag
index 415fce91a31..840188d3dfb 100644
--- a/src/v2/test/claim/namespace_xl0/body_shape_contract_test.dag
+++ b/src/v2/test/claim/namespace_xl0/body_shape_contract_test.dag
@@ -35,7 +35,7 @@ import v2.std.integer { Int }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Node, Symbol, TypeNode }
 import v2.std.node_query { find_arrow_body_child, find_named_child }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.text { String }
 import std.occurrence_identity { OccurrenceSynthetic }
 
diff --git a/src/v2/test/claim/namespace_xl0/bound_value_resolve_refusal_test.dag b/src/v2/test/claim/namespace_xl0/bound_value_resolve_refusal_test.dag
index 37356c919d4..2bcdef08396 100644
--- a/src/v2/test/claim/namespace_xl0/bound_value_resolve_refusal_test.dag
+++ b/src/v2/test/claim/namespace_xl0/bound_value_resolve_refusal_test.dag
@@ -19,7 +19,7 @@ import v2.std.diagnostic { Accepted, NodeLocus, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
 import extdeps.communication.medium { Lossless, Medium }
diff --git a/src/v2/test/claim/namespace_xl0/call_argument_resolve_refusal_test.dag b/src/v2/test/claim/namespace_xl0/call_argument_resolve_refusal_test.dag
index cd29e6f5be1..6ea5c2e056c 100644
--- a/src/v2/test/claim/namespace_xl0/call_argument_resolve_refusal_test.dag
+++ b/src/v2/test/claim/namespace_xl0/call_argument_resolve_refusal_test.dag
@@ -19,7 +19,7 @@ import v2.std.diagnostic { Accepted, NodeLocus, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
 import extdeps.communication.medium { Lossless, Medium }
diff --git a/src/v2/test/claim/namespace_xl0/call_argument_value_resolve_refusal_test.dag b/src/v2/test/claim/namespace_xl0/call_argument_value_resolve_refusal_test.dag
index 27ada8868aa..0536289f9ef 100644
--- a/src/v2/test/claim/namespace_xl0/call_argument_value_resolve_refusal_test.dag
+++ b/src/v2/test/claim/namespace_xl0/call_argument_value_resolve_refusal_test.dag
@@ -11,6 +11,7 @@ import v2.compiler.compile {
   native_lane_file_refusal_index,
   native_test_context_from_ingest
 }
+import v2.compiler.native_test_vocabulary { native_test_file_refusal_fatal_reason }
 import v2.compiler.source_authority { DagSourceReadWitness, SourceRootIngest }
 import v2.std.algebra { fold_list }
 import v2.std.artifact { Artifact, SourceFile }
@@ -19,7 +20,7 @@ import v2.std.diagnostic { Accepted, NodeLocus, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
 import extdeps.communication.medium { Lossless, Medium }
@@ -205,7 +206,7 @@ fn cav_file_refusal_reason(context: NativeTestContext, unit: Symbol) -> Optional
     xs: context.file_refusals,
     empty: optional_absent(),
     cons: fn(acc, refusal) {
-      if refusal.path == unit { optional_present(value: refusal.fatal_reason) } else { acc }
+      if refusal.path == unit { optional_present(value: native_test_file_refusal_fatal_reason(fr: refusal)) } else { acc }
     }
   )
 }
diff --git a/src/v2/test/claim/namespace_xl0/cross_module_reference_resolution_test.dag b/src/v2/test/claim/namespace_xl0/cross_module_reference_resolution_test.dag
index 1484575e7b1..67243be5db9 100644
--- a/src/v2/test/claim/namespace_xl0/cross_module_reference_resolution_test.dag
+++ b/src/v2/test/claim/namespace_xl0/cross_module_reference_resolution_test.dag
@@ -32,7 +32,7 @@ import v2.std.artifact { Artifact, SourceFile }
 import v2.std.cross_tree.import_model { DagTree }
 import v2.std.diagnostic { Accepted, NonEmptyDiagnostics, Outcome, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.node { Node, Symbol, node_subtree_nodes }
 import v2.std.qualified_name {
   QualifiedName,
diff --git a/src/v2/test/claim/namespace_xl0/else_arm_nested_if_test.dag b/src/v2/test/claim/namespace_xl0/else_arm_nested_if_test.dag
index 8faf5a8e995..bcd51709360 100644
--- a/src/v2/test/claim/namespace_xl0/else_arm_nested_if_test.dag
+++ b/src/v2/test/claim/namespace_xl0/else_arm_nested_if_test.dag
@@ -19,7 +19,7 @@ import v2.std.diagnostic { Accepted, NodeLocus, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
 import extdeps.communication.medium { Lossless, Medium }
diff --git a/src/v2/test/claim/namespace_xl0/if_arm_and_statement_lowering_refusal_test.dag b/src/v2/test/claim/namespace_xl0/if_arm_and_statement_lowering_refusal_test.dag
index a29f97034fa..16fe636d7a7 100644
--- a/src/v2/test/claim/namespace_xl0/if_arm_and_statement_lowering_refusal_test.dag
+++ b/src/v2/test/claim/namespace_xl0/if_arm_and_statement_lowering_refusal_test.dag
@@ -11,6 +11,7 @@ import v2.compiler.compile {
   native_lane_file_refusal_index,
   native_test_context_from_ingest
 }
+import v2.compiler.native_test_vocabulary { native_test_file_refusal_fatal_reason }
 import v2.compiler.source_authority { DagSourceReadWitness, SourceRootIngest }
 import v2.std.algebra { fold_list }
 import v2.std.artifact { Artifact, SourceFile }
@@ -19,7 +20,7 @@ import v2.std.diagnostic { Accepted, NodeLocus, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
 import extdeps.communication.medium { Lossless, Medium }
@@ -167,7 +168,7 @@ fn iasl_file_refusal_reason(context: NativeTestContext, unit: Symbol) -> Optiona
     xs: context.file_refusals,
     empty: optional_absent(),
     cons: fn(acc, refusal) {
-      if refusal.path == unit { optional_present(value: refusal.fatal_reason) } else { acc }
+      if refusal.path == unit { optional_present(value: native_test_file_refusal_fatal_reason(fr: refusal)) } else { acc }
     }
   )
 }
diff --git a/src/v2/test/claim/namespace_xl0/let_match_early_return_test.dag b/src/v2/test/claim/namespace_xl0/let_match_early_return_test.dag
index fe12bdb809f..134c345ccd4 100644
--- a/src/v2/test/claim/namespace_xl0/let_match_early_return_test.dag
+++ b/src/v2/test/claim/namespace_xl0/let_match_early_return_test.dag
@@ -17,6 +17,7 @@ import v2.compiler.tokenize { tokenize }
 import v2.extdeps.languages.dag { dag_language_model }
 import v2.std.collection { List }
 import v2.std.integer { Int }
+import v2.compiler.native_test_vocabulary { native_test_file_refusal_fatal_reason }
 import v2.compiler.source_authority { DagSourceReadWitness, SourceRootIngest }
 import v2.std.algebra { fold_list }
 import v2.std.artifact { Artifact, SourceFile }
@@ -26,7 +27,7 @@ import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.logic { Bool }
 import v2.std.node { Node, Symbol, node_subtree_nodes }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
 import extdeps.communication.medium { Lossless, Medium }
@@ -151,7 +152,7 @@ fn lme_file_refusal_reason(context: NativeTestContext, unit: Symbol) -> Optional
     xs: context.file_refusals,
     empty: optional_absent(),
     cons: fn(acc, refusal) {
-      if refusal.path == unit { optional_present(value: refusal.fatal_reason) } else { acc }
+      if refusal.path == unit { optional_present(value: native_test_file_refusal_fatal_reason(fr: refusal)) } else { acc }
     }
   )
 }
diff --git a/src/v2/test/claim/namespace_xl0/list_literal_value_lowering_test.dag b/src/v2/test/claim/namespace_xl0/list_literal_value_lowering_test.dag
index a9a158ab856..d029a427be0 100644
--- a/src/v2/test/claim/namespace_xl0/list_literal_value_lowering_test.dag
+++ b/src/v2/test/claim/namespace_xl0/list_literal_value_lowering_test.dag
@@ -26,7 +26,7 @@ import v2.std.node_query { node_positional_child_targets }
 import v2.std.qualified_name { QualifiedName, declaration_reference_node, qualified_name_from_node }
 import v2.std.collection { list_at_optional }
 import v2.extdeps.languages.dag { dag_language_model }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.process { ProcessExit, exit_failure }
 import std.algebra { Cons, Empty, FreeMonoid }
diff --git a/src/v2/test/claim/namespace_xl0/reference_conservation_test.dag b/src/v2/test/claim/namespace_xl0/reference_conservation_test.dag
index 19b2eb8c990..a190cdecbd1 100644
--- a/src/v2/test/claim/namespace_xl0/reference_conservation_test.dag
+++ b/src/v2/test/claim/namespace_xl0/reference_conservation_test.dag
@@ -17,7 +17,7 @@ import v2.compiler.reference_conservation {
   OccurrenceRoleTableUnadmitted
 }
 import std.algebra { Cons, Empty }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.compiler.source_authority { DagSourceReadWitness }
 import v2.compiler.occurrence_role { NameProductionTableAdmission, NameProductionTableRefused, NameRoleNotYetRead, dag_name_production_rows, name_production_table_admission, name_row }
 import v2.extdeps.languages.dag { dag_grammar_root, dag_language_model }
diff --git a/src/v2/test/claim/namespace_xl0/return_tail_position_test.dag b/src/v2/test/claim/namespace_xl0/return_tail_position_test.dag
index 808993963f0..11ea2f43ba8 100644
--- a/src/v2/test/claim/namespace_xl0/return_tail_position_test.dag
+++ b/src/v2/test/claim/namespace_xl0/return_tail_position_test.dag
@@ -11,6 +11,7 @@ import v2.compiler.compile {
   native_lane_file_refusal_index,
   native_test_context_from_ingest
 }
+import v2.compiler.native_test_vocabulary { native_test_file_refusal_fatal_reason }
 import v2.compiler.source_authority { DagSourceReadWitness, SourceRootIngest }
 import v2.std.algebra { fold_list }
 import v2.std.artifact { Artifact, SourceFile }
@@ -19,7 +20,7 @@ import v2.std.diagnostic { Accepted, NodeLocus, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
 import extdeps.communication.medium { Lossless, Medium }
@@ -183,7 +184,7 @@ fn rtp_file_refusal_reason(context: NativeTestContext, unit: Symbol) -> Optional
     xs: context.file_refusals,
     empty: optional_absent(),
     cons: fn(acc, refusal) {
-      if refusal.path == unit { optional_present(value: refusal.fatal_reason) } else { acc }
+      if refusal.path == unit { optional_present(value: native_test_file_refusal_fatal_reason(fr: refusal)) } else { acc }
     }
   )
 }
diff --git a/src/v2/test/claim/namespace_xl0/sequence_operand_resolve_refusal_test.dag b/src/v2/test/claim/namespace_xl0/sequence_operand_resolve_refusal_test.dag
index 98ca6108f3b..d4a31e4e431 100644
--- a/src/v2/test/claim/namespace_xl0/sequence_operand_resolve_refusal_test.dag
+++ b/src/v2/test/claim/namespace_xl0/sequence_operand_resolve_refusal_test.dag
@@ -19,7 +19,7 @@ import v2.std.diagnostic { Accepted, NodeLocus, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
 import extdeps.communication.medium { Lossless, Medium }
diff --git a/src/v2/test/claim/namespace_xl0/value_position_whole_read_test.dag b/src/v2/test/claim/namespace_xl0/value_position_whole_read_test.dag
index d4864136bdc..45cbf69e8c6 100644
--- a/src/v2/test/claim/namespace_xl0/value_position_whole_read_test.dag
+++ b/src/v2/test/claim/namespace_xl0/value_position_whole_read_test.dag
@@ -47,7 +47,7 @@ import v2.std.node_query { binder_node_parts, field_projection_optional, node_po
 import v2.std.type_binder { type_param_names }
 import v2.std.collection { list_at_optional }
 import v2.extdeps.languages.dag { dag_language_model }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty, FreeMonoid, list_append }
 import extdeps.communication.medium { Lossless, Medium }
diff --git a/src/v2/test/claim/namespace_xl0/value_read_refusal_test.dag b/src/v2/test/claim/namespace_xl0/value_read_refusal_test.dag
index f6ccdbbfb87..b7178591e51 100644
--- a/src/v2/test/claim/namespace_xl0/value_read_refusal_test.dag
+++ b/src/v2/test/claim/namespace_xl0/value_read_refusal_test.dag
@@ -10,7 +10,7 @@ import v2.std.diagnostic { Accepted, Diagnostic, NodeLocus, Rejected, diagnostic
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol, node_subtree_nodes }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/namespace_xl0/wildcard_arm_resolve_test.dag b/src/v2/test/claim/namespace_xl0/wildcard_arm_resolve_test.dag
index 8c381e1d1be..08f50fc60d2 100644
--- a/src/v2/test/claim/namespace_xl0/wildcard_arm_resolve_test.dag
+++ b/src/v2/test/claim/namespace_xl0/wildcard_arm_resolve_test.dag
@@ -19,7 +19,7 @@ import v2.std.diagnostic { Accepted, NodeLocus, Rejected }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
 import extdeps.communication.medium { Lossless, Medium }
diff --git a/src/v2/test/claim/native_census/cascade_root_fan_out_test.dag b/src/v2/test/claim/native_census/cascade_root_fan_out_test.dag
index 9e2e2003f77..f774715c27f 100644
--- a/src/v2/test/claim/native_census/cascade_root_fan_out_test.dag
+++ b/src/v2/test/claim/native_census/cascade_root_fan_out_test.dag
@@ -31,7 +31,7 @@ import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.logic { Bool }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/native_census/whole_tree_census_resolve_test.dag b/src/v2/test/claim/native_census/whole_tree_census_resolve_test.dag
index 3f6b850160f..f24f3580f31 100644
--- a/src/v2/test/claim/native_census/whole_tree_census_resolve_test.dag
+++ b/src/v2/test/claim/native_census/whole_tree_census_resolve_test.dag
@@ -37,7 +37,7 @@ import v2.std.diagnostic { Accepted, NonEmptyDiagnostics, Outcome, Rejected, dia
 import v2.compiler.resolve { ObservationComplete, ObservationIncomplete }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/native_route/native_refusal_detail_test.dag b/src/v2/test/claim/native_route/native_refusal_detail_test.dag
index 51d3a6374f5..7b169369731 100644
--- a/src/v2/test/claim/native_route/native_refusal_detail_test.dag
+++ b/src/v2/test/claim/native_route/native_refusal_detail_test.dag
@@ -53,7 +53,7 @@ import v2.std.diagnostic {
 import v2.std.lens_verdict { lens_verdict_diagnostic_locus_text }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol, Atom, Conj, TypeNode, node_synthetic, symbol_intern_lexeme }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name { qualified_name_from_dotted_string }
 import v2.std.text { String }
 import std.occurrence_identity { OccurrenceMinted, OccurrencePending, OccurrenceProjected, OccurrenceSynthetic }
diff --git a/src/v2/test/claim/normalize/authored_marker_spelling_test.dag b/src/v2/test/claim/normalize/authored_marker_spelling_test.dag
index 4df1ca71d02..6995b238c35 100644
--- a/src/v2/test/claim/normalize/authored_marker_spelling_test.dag
+++ b/src/v2/test/claim/normalize/authored_marker_spelling_test.dag
@@ -9,7 +9,7 @@ import v2.extdeps.languages.dag { dag_canonical_symbols, dag_language_model }
 import v2.std.diagnostic { Accepted, Rejected, diagnostics_fatal_reason }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.node { Edge, Authored, Node, Positional, Symbol, node_subtree_nodes, StructuralLabel }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 // AUTHORED TEXT SPELLED LIKE A GRAMMAR MARKER IS NOT A MARKER.
diff --git a/src/v2/test/claim/normalize/census_mode_test.dag b/src/v2/test/claim/normalize/census_mode_test.dag
index 139a32aec26..fc5f61b9982 100644
--- a/src/v2/test/claim/normalize/census_mode_test.dag
+++ b/src/v2/test/claim/normalize/census_mode_test.dag
@@ -27,7 +27,7 @@ import v2.std.namespace_alias { ModuleBindingSource }
 import v2.std.symbol_index { SymbolIndex, empty_symbol_index, symbol_index_lookup }
 import v2.std.node_query { find_arrow_body_child }
 import v2.std.diagnostic { Accepted, Outcome, Rejected, bind_outcome, diagnostics_fatal_reason }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.qualified_name { QualifiedName, qualified_name_from_dotted_string }
 import v2.std.node { Node, Symbol, Authored }
 import v2.std.text { String }
diff --git a/src/v2/test/claim/normalize/operation_modifier_test.dag b/src/v2/test/claim/normalize/operation_modifier_test.dag
index 6f1daa82771..a6d1047af97 100644
--- a/src/v2/test/claim/normalize/operation_modifier_test.dag
+++ b/src/v2/test/claim/normalize/operation_modifier_test.dag
@@ -2,7 +2,7 @@ module v2.test.claim.normalize.operation_modifier
 
 import v2.compiler.reference_conservation_admission { conservation_subject_of_text }
 import v2.std.diagnostic { Accepted, ByteRange, Locus, WholeFile, NodeLocus, Rejected, Textual, diagnostics_fatal, diagnostics_fatal_reason }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.provenance { SpanIndex, node_occurrence_id_optional, span_index_textual_locus_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import std.types { List }
diff --git a/src/v2/test/claim/normalize/operation_requires_edge_test.dag b/src/v2/test/claim/normalize/operation_requires_edge_test.dag
index 8876eb8ab0c..c35b500b37c 100644
--- a/src/v2/test/claim/normalize/operation_requires_edge_test.dag
+++ b/src/v2/test/claim/normalize/operation_requires_edge_test.dag
@@ -17,7 +17,7 @@ import v2.extdeps.languages.dag { dag_grammar_atom, dag_language_model_surface_e
 import v2.test.parse.supplied_token_stream_support { supplied_stream_matches_tokenize, supplied_stream_parse }
 import v2.std.compilers.lexing { Token, TokenStream, token_stream_new }
 import v2.std.diagnostic { Accepted, Outcome, Rejected, bind_outcome, diagnostics_fatal_reason }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.node { Arrow, Atom, Conj, Edge, Found, Node, Positional, Symbol, TypeNode, node_subtree_nodes, symbol_intern_lexeme, ArrowResourceRequirementsEdge, Authored, core_edge_target_lookup, core_edge_label }
 import v2.std.integer { Int }
diff --git a/src/v2/test/claim/normalize/resource_declaration_lowering_test.dag b/src/v2/test/claim/normalize/resource_declaration_lowering_test.dag
index d2e71531c59..ec7fc64a8cb 100644
--- a/src/v2/test/claim/normalize/resource_declaration_lowering_test.dag
+++ b/src/v2/test/claim/normalize/resource_declaration_lowering_test.dag
@@ -9,7 +9,7 @@ import v2.std.compilers.lexing { Token, TokenStream, token_stream_new }
 import v2.std.symbol_index { SymbolIndex, empty_symbol_index, symbol_index_declares_resource_at, symbol_index_lookup }
 import v2.std.diagnostic { Accepted, Diagnostics, NonEmptyDiagnostics, None, Outcome, Rejected, Some, bind_outcome, diagnostics_fatal_reason }
 import v2.std.algebra { fold_list }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.integer { Int }
 import v2.std.node { Node, Symbol, node_subtree_nodes, symbol_intern_lexeme }
 import v2.std.text { String }
diff --git a/src/v2/test/claim/normalize/service_declaration_lowering_test.dag b/src/v2/test/claim/normalize/service_declaration_lowering_test.dag
index b1e6013304c..301165aa404 100644
--- a/src/v2/test/claim/normalize/service_declaration_lowering_test.dag
+++ b/src/v2/test/claim/normalize/service_declaration_lowering_test.dag
@@ -8,7 +8,7 @@ import v2.std.compilers.lexing { Token, TokenStream, token_stream_new }
 import v2.std.symbol_index { SymbolIndex, empty_symbol_index, symbol_index_lookup }
 import v2.std.diagnostic { Accepted, Diagnostic, Diagnostics, NonEmptyDiagnostics, Outcome, Rejected, Some, bind_outcome, diagnostics_fatal_reason }
 import v2.std.algebra { fold_list }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.integer { Int }
 import v2.std.node { Node, Symbol, symbol_intern_lexeme }
 import v2.std.text { String }
diff --git a/src/v2/test/claim/normalize/service_realization_lowering_test.dag b/src/v2/test/claim/normalize/service_realization_lowering_test.dag
index 275dc0f4c7d..df44da7e6ed 100644
--- a/src/v2/test/claim/normalize/service_realization_lowering_test.dag
+++ b/src/v2/test/claim/normalize/service_realization_lowering_test.dag
@@ -15,7 +15,7 @@ import v2.std.service_realization_labels {
 import v2.std.diagnostic { Accepted, Outcome, Rejected, diagnostics_fatal_reason }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.integer { Int }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import std.types { List }
 import v2.std.list_introduction { list_introduction_elements_optional }
 import v2.std.text { String }
diff --git a/src/v2/test/claim/normalize/service_spine_test.dag b/src/v2/test/claim/normalize/service_spine_test.dag
index 57f7f346d0b..793c67a417b 100644
--- a/src/v2/test/claim/normalize/service_spine_test.dag
+++ b/src/v2/test/claim/normalize/service_spine_test.dag
@@ -16,7 +16,7 @@ import v2.std.symbol_index { LexicalAmbiguous, LexicalHit, LexicalUnbound, Symbo
 import v2.std.diagnostic { Accepted, Outcome, Rejected, diagnostics_fatal_reason }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol, symbol_intern_lexeme }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.text { String }
 import std.algebra { Cons, Empty, FreeMonoid }
 
diff --git a/src/v2/test/claim/occurrence_role/occurrence_role_test.dag b/src/v2/test/claim/occurrence_role/occurrence_role_test.dag
index 49cba35a660..b75585755af 100644
--- a/src/v2/test/claim/occurrence_role/occurrence_role_test.dag
+++ b/src/v2/test/claim/occurrence_role/occurrence_role_test.dag
@@ -24,7 +24,7 @@ import v2.extdeps.languages.dag { dag_grammar_root }
 import std.algebra { Empty }
 import v2.std.algebra { fold_list, length, list_snoc_item }
 import v2.std.collection { Map, map_lookup }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.node { Atom, Conj, Edge, Authored, Node, TypeNode, node_with_occurrence_id, symbol_intern_lexeme }
 import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.diagnostic { Accepted, Rejected }
diff --git a/src/v2/test/claim/parameter_reference_test.dag b/src/v2/test/claim/parameter_reference_test.dag
index cdf92d1b9a0..d0c101c78fd 100644
--- a/src/v2/test/claim/parameter_reference_test.dag
+++ b/src/v2/test/claim/parameter_reference_test.dag
@@ -45,7 +45,7 @@ import v2.std.declaration_marker { test_code_index_empty }
 import v2.std.diagnostic { Accepted, Outcome, Rejected, diagnostics_fatal_reason }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Node, Symbol, TypeNode, node_subtree_nodes }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 import v2.std.qualified_name {
   QualifiedName,
   declaration_reference_node,
diff --git a/src/v2/test/claim/parse/alias_decl_parse.dag b/src/v2/test/claim/parse/alias_decl_parse.dag
index fb9e618644f..1d22e950785 100644
--- a/src/v2/test/claim/parse/alias_decl_parse.dag
+++ b/src/v2/test/claim/parse/alias_decl_parse.dag
@@ -1,6 +1,6 @@
 module v2.test.parse.alias_decl_parse
 
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/test/claim/parse/bare_node_statement_route_test.dag b/src/v2/test/claim/parse/bare_node_statement_route_test.dag
index 578cb045966..419fe139600 100644
--- a/src/v2/test/claim/parse/bare_node_statement_route_test.dag
+++ b/src/v2/test/claim/parse/bare_node_statement_route_test.dag
@@ -8,7 +8,7 @@ import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.logic { Bool }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/parse/block_expr_as_binary_operand_parse_test.dag b/src/v2/test/claim/parse/block_expr_as_binary_operand_parse_test.dag
index 92ddf90f1d5..c9885ae2fbd 100644
--- a/src/v2/test/claim/parse/block_expr_as_binary_operand_parse_test.dag
+++ b/src/v2/test/claim/parse/block_expr_as_binary_operand_parse_test.dag
@@ -6,7 +6,7 @@ import v2.compiler.program_assembly { dag_prepared_grammar }
 import v2.compiler.tokenize { tokenize }
 import v2.extdeps.languages.dag { dag_lex }
 import v2.std.diagnostic { Accepted, Outcome, Rejected, bind_outcome }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Branch, ComputationNode, Match, Node, NodeKind, Symbol }
 import v2.std.node_query { find_arrow_body_child }
diff --git a/src/v2/test/claim/parse/brace_and_lambda_head_route_test.dag b/src/v2/test/claim/parse/brace_and_lambda_head_route_test.dag
index 86787b951ac..b373a66c3b2 100644
--- a/src/v2/test/claim/parse/brace_and_lambda_head_route_test.dag
+++ b/src/v2/test/claim/parse/brace_and_lambda_head_route_test.dag
@@ -7,7 +7,7 @@ import v2.extdeps.languages.dag { dag_lex, parse_production_emitted_identity_opt
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/parse/choice_lookahead_guard_test.dag b/src/v2/test/claim/parse/choice_lookahead_guard_test.dag
index 40e96e41f68..6776d1e17de 100644
--- a/src/v2/test/claim/parse/choice_lookahead_guard_test.dag
+++ b/src/v2/test/claim/parse/choice_lookahead_guard_test.dag
@@ -23,7 +23,7 @@ import v2.extdeps.languages.dag { dag_lex }
 import v2.std.diagnostic { Accepted, Outcome, Rejected, bind_outcome }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/parse/choice_plan_test.dag b/src/v2/test/claim/parse/choice_plan_test.dag
index 6490cf536cc..3010c248df2 100644
--- a/src/v2/test/claim/parse/choice_plan_test.dag
+++ b/src/v2/test/claim/parse/choice_plan_test.dag
@@ -43,7 +43,7 @@ import v2.compiler.parse {
   prepare_grammar_expr
 }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.algebra { fold_list, length }
 import v2.std.diagnostic { Accepted, Diagnostic, NonEmptyDiagnostics, None, Rejected, Some, invariant_port_locus }
 import v2.std.node { Hash, Symbol, content_hash }
diff --git a/src/v2/test/claim/parse/d1_declaration_grammar_parse_test.dag b/src/v2/test/claim/parse/d1_declaration_grammar_parse_test.dag
index 6bc00f071f4..93c8f4a4a10 100644
--- a/src/v2/test/claim/parse/d1_declaration_grammar_parse_test.dag
+++ b/src/v2/test/claim/parse/d1_declaration_grammar_parse_test.dag
@@ -14,7 +14,7 @@ import v2.extdeps.languages.dag {
 import v2.std.diagnostic { Accepted, Outcome, Rejected, bind_outcome }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Edge, Authored, Node, Positional, well_formed, symbol_lexeme, StructuralLabel }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import std.process { ExitSuccess, ProcessExit, exit_failure }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/parse/d5_expression_grammar_parse_test.dag b/src/v2/test/claim/parse/d5_expression_grammar_parse_test.dag
index b59bc4971a1..12dea97c443 100644
--- a/src/v2/test/claim/parse/d5_expression_grammar_parse_test.dag
+++ b/src/v2/test/claim/parse/d5_expression_grammar_parse_test.dag
@@ -7,7 +7,7 @@ import v2.std.diagnostic { Accepted, Outcome, Rejected, bind_outcome }
 import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, symbol_lexeme }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/parse/declaration_choice_route_test.dag b/src/v2/test/claim/parse/declaration_choice_route_test.dag
index ba3e437500b..2639affc398 100644
--- a/src/v2/test/claim/parse/declaration_choice_route_test.dag
+++ b/src/v2/test/claim/parse/declaration_choice_route_test.dag
@@ -24,7 +24,7 @@ import v2.std.grammar { node_atom_identity_optional }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.integer { Int }
 import v2.std.node { Authored, Edge, Node, Positional, StructuralLabel, Symbol, is_empty_conj_root, symbol_lexeme }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.text { String }
 import std.algebra { list_snoc_item }
 import std.types { List }
diff --git a/src/v2/test/claim/parse/default_value_test.dag b/src/v2/test/claim/parse/default_value_test.dag
index b8f85462963..26677c30c5a 100644
--- a/src/v2/test/claim/parse/default_value_test.dag
+++ b/src/v2/test/claim/parse/default_value_test.dag
@@ -5,7 +5,7 @@ import v2.std.diagnostic { Accepted, Rejected, diagnostics_fatal }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol }
 import v2.std.node_query { binder_node_parts }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/parse/else_less_if_value_category_test.dag b/src/v2/test/claim/parse/else_less_if_value_category_test.dag
index 8b6bb9dd49b..05192cbacb2 100644
--- a/src/v2/test/claim/parse/else_less_if_value_category_test.dag
+++ b/src/v2/test/claim/parse/else_less_if_value_category_test.dag
@@ -12,7 +12,7 @@ import v2.extdeps.languages.dag { dag_lex, parse_production_emitted_identity_opt
 import v2.std.diagnostic { Accepted, DeclarationLocus, InvariantPortLocus, Locus, NodeLocus, Rejected, SourcePortLocus, Textual, diagnostics_fatal }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/parse/keyword_value_name_parse_test.dag b/src/v2/test/claim/parse/keyword_value_name_parse_test.dag
index 782b1dbca74..d74b20fd9ce 100644
--- a/src/v2/test/claim/parse/keyword_value_name_parse_test.dag
+++ b/src/v2/test/claim/parse/keyword_value_name_parse_test.dag
@@ -9,7 +9,7 @@ import v2.std.algebra { Cons, Empty }
 import v2.std.collection { List }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.logic { Bool }
 import v2.std.parse_refusal_reason { KeywordAsValueName }
diff --git a/src/v2/test/claim/parse/layout_line_break_test.dag b/src/v2/test/claim/parse/layout_line_break_test.dag
index f088546847b..1d6321d917a 100644
--- a/src/v2/test/claim/parse/layout_line_break_test.dag
+++ b/src/v2/test/claim/parse/layout_line_break_test.dag
@@ -50,7 +50,7 @@ import v2.std.grammar {
 import v2.std.integer { Int }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol, content_hash }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.parse_refusal_reason {
   FnExpressionBodyMissingAfterEq,
   LayoutUnknownWithoutSource,
diff --git a/src/v2/test/claim/parse/match_arm_statement_body_parse_test.dag b/src/v2/test/claim/parse/match_arm_statement_body_parse_test.dag
index 7deed6b2a75..bfa5c2fdb44 100644
--- a/src/v2/test/claim/parse/match_arm_statement_body_parse_test.dag
+++ b/src/v2/test/claim/parse/match_arm_statement_body_parse_test.dag
@@ -6,7 +6,7 @@ import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.integer { Int }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/parse/newline_dual_role_operator_parse_test.dag b/src/v2/test/claim/parse/newline_dual_role_operator_parse_test.dag
index 4927a1c5704..ec8bb1d05af 100644
--- a/src/v2/test/claim/parse/newline_dual_role_operator_parse_test.dag
+++ b/src/v2/test/claim/parse/newline_dual_role_operator_parse_test.dag
@@ -31,7 +31,7 @@ import v2.std.diagnostic {
 import v2.std.integer { Int }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.parse_refusal_reason { NewlineBeforeDualRoleOperator, parse_refusal_reason_symbol }
 import v2.std.text { String }
 
diff --git a/src/v2/test/claim/parse/parameter_refinement_test.dag b/src/v2/test/claim/parse/parameter_refinement_test.dag
index dbaed37c699..841a53ca144 100644
--- a/src/v2/test/claim/parse/parameter_refinement_test.dag
+++ b/src/v2/test/claim/parse/parameter_refinement_test.dag
@@ -4,7 +4,7 @@ import v2.compiler.reference_conservation_admission { conservation_subject_of_te
 import v2.extdeps.languages.dag { parse_production_emitted_identity_optional }
 import v2.std.diagnostic { Accepted, NodeLocus, Rejected, diagnostics_fatal }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/parse/parse_binding_fidelity_support.dag b/src/v2/test/claim/parse/parse_binding_fidelity_support.dag
index c1f9c81c112..e8ccc247aa7 100644
--- a/src/v2/test/claim/parse/parse_binding_fidelity_support.dag
+++ b/src/v2/test/claim/parse/parse_binding_fidelity_support.dag
@@ -28,7 +28,7 @@ import v2.std.algebra { fold_list_node }
 import v2.std.collection {
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/test/claim/parse/parse_test_block_headed_operand_class_test.dag b/src/v2/test/claim/parse/parse_test_block_headed_operand_class_test.dag
index 0495853bc90..f65bb3e8c0c 100644
--- a/src/v2/test/claim/parse/parse_test_block_headed_operand_class_test.dag
+++ b/src/v2/test/claim/parse/parse_test_block_headed_operand_class_test.dag
@@ -9,7 +9,7 @@ import std.occurrence_identity { occurrence_id_allocator_initial }
 import v2.std.compilers.lexing { token_stream_layout, token_stream_remaining }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.node { Node, Symbol }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.text { String }
 
diff --git a/src/v2/test/claim/parse/parse_test_parse_binding_fidelity_test.dag b/src/v2/test/claim/parse/parse_test_parse_binding_fidelity_test.dag
index 63aaa3aa27c..36afd632e2a 100644
--- a/src/v2/test/claim/parse/parse_test_parse_binding_fidelity_test.dag
+++ b/src/v2/test/claim/parse/parse_test_parse_binding_fidelity_test.dag
@@ -31,7 +31,7 @@ import v2.std.algebra { fold_list_node }
 import v2.std.collection {
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present
diff --git a/src/v2/test/claim/parse/parse_test_type_decl_modifier_carrier_test.dag b/src/v2/test/claim/parse/parse_test_type_decl_modifier_carrier_test.dag
index f28c763de98..38e74ea354f 100644
--- a/src/v2/test/claim/parse/parse_test_type_decl_modifier_carrier_test.dag
+++ b/src/v2/test/claim/parse/parse_test_type_decl_modifier_carrier_test.dag
@@ -18,7 +18,7 @@ import v2.std.diagnostic { Accepted, Outcome, Rejected, bind_outcome }
 import v2.std.language_model { LanguageModel }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Node, Symbol, node_subtree_nodes, symbol_lexeme }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/parse/parse_test_type_decl_modifier_g0_parse_probe_test.dag b/src/v2/test/claim/parse/parse_test_type_decl_modifier_g0_parse_probe_test.dag
index 677aca77257..df9d2dff6ce 100644
--- a/src/v2/test/claim/parse/parse_test_type_decl_modifier_g0_parse_probe_test.dag
+++ b/src/v2/test/claim/parse/parse_test_type_decl_modifier_g0_parse_probe_test.dag
@@ -10,7 +10,7 @@ import v2.std.language_model { LanguageModel }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol, node_subtree_nodes, symbol_lexeme }
 import v2.std.algebra { fold_list, list_snoc_item }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/parse/pattern_and_let_sugar_test.dag b/src/v2/test/claim/parse/pattern_and_let_sugar_test.dag
index fe265dd4430..9befbcd1874 100644
--- a/src/v2/test/claim/parse/pattern_and_let_sugar_test.dag
+++ b/src/v2/test/claim/parse/pattern_and_let_sugar_test.dag
@@ -5,7 +5,7 @@ import v2.extdeps.languages.dag { parse_production_emitted_identity_optional }
 import v2.std.diagnostic { Accepted, NodeLocus, Rejected, diagnostics_fatal }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Hash, content_hash }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/parse/uses_clause_test.dag b/src/v2/test/claim/parse/uses_clause_test.dag
index 207160b6cf7..49b6d37b065 100644
--- a/src/v2/test/claim/parse/uses_clause_test.dag
+++ b/src/v2/test/claim/parse/uses_clause_test.dag
@@ -4,7 +4,7 @@ import v2.compiler.reference_conservation_admission { conservation_subject_of_te
 import v2.extdeps.languages.dag { parse_production_emitted_identity_optional }
 import v2.std.diagnostic { Accepted, NodeLocus, Rejected, diagnostics_fatal }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/parse/variant_field_lowering_test.dag b/src/v2/test/claim/parse/variant_field_lowering_test.dag
index f88b6afd0d8..a7f1c4451ed 100644
--- a/src/v2/test/claim/parse/variant_field_lowering_test.dag
+++ b/src/v2/test/claim/parse/variant_field_lowering_test.dag
@@ -45,7 +45,7 @@ import v2.std.node_query {
   positional_payload_field_name,
   find_core_child,
 }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.collection { list_at_optional }
 import v2.std.qualified_name { qualified_name_to_dotted_string }
 import v2.test.parse.supplied_token_stream_support { supplied_stream_matches_tokenize, supplied_stream_projection }
diff --git a/src/v2/test/claim/parse/where_refinement_clause_parse_test.dag b/src/v2/test/claim/parse/where_refinement_clause_parse_test.dag
index bdd76214171..03479615671 100644
--- a/src/v2/test/claim/parse/where_refinement_clause_parse_test.dag
+++ b/src/v2/test/claim/parse/where_refinement_clause_parse_test.dag
@@ -14,7 +14,7 @@ import v2.extdeps.languages.dag {
 import v2.std.diagnostic { Accepted, Outcome, Rejected, bind_outcome }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Edge, Authored, Node, Positional, symbol_lexeme, StructuralLabel }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import std.process { ExitSuccess, ProcessExit, exit_failure }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/projection_dispatch/receiver_disposition_test.dag b/src/v2/test/claim/projection_dispatch/receiver_disposition_test.dag
index af24f7acc47..d44005b9fb5 100644
--- a/src/v2/test/claim/projection_dispatch/receiver_disposition_test.dag
+++ b/src/v2/test/claim/projection_dispatch/receiver_disposition_test.dag
@@ -6,7 +6,7 @@ import v2.std.node_query { field_projection_node, field_projection_optional }
 import v2.std.node { Atom, Node, Symbol, TypeNode, node_synthetic }
 import std.occurrence_identity { OccurrenceSynthetic }
 import v2.std.algebra { Cons, Empty }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data live_tree_disposition: LiveTreeDisposition = ReadsLiveTree
 
diff --git a/src/v2/test/claim/provenance/loaded_carrier_receipts_test.dag b/src/v2/test/claim/provenance/loaded_carrier_receipts_test.dag
index 076a78e836c..ea0f59b9f31 100644
--- a/src/v2/test/claim/provenance/loaded_carrier_receipts_test.dag
+++ b/src/v2/test/claim/provenance/loaded_carrier_receipts_test.dag
@@ -17,7 +17,7 @@ import v2.std.cross_tree.import_model { V2Tree }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Edge, Authored, Node, NodeFold, Positional, Symbol, TypeNode, fold_node, StructuralLabel }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name { QualifiedName, qualified_name_from_dotted_string }
 import v2.lens.module_graph { LocatedModuleRoot, located_roots_from_source_root_ingest, reference_derived_pool_from_located_roots }
 import v2.std.namespace_alias { ModuleBindingSource }
diff --git a/src/v2/test/claim/provenance/occurrence_file_attribution_test.dag b/src/v2/test/claim/provenance/occurrence_file_attribution_test.dag
index 6cd9846c74f..f6f7115ddc9 100644
--- a/src/v2/test/claim/provenance/occurrence_file_attribution_test.dag
+++ b/src/v2/test/claim/provenance/occurrence_file_attribution_test.dag
@@ -35,7 +35,7 @@ import v2.std.node { Node, Symbol, symbol_intern_lexeme, symbol_lexeme }
 import v2.compiler.normalized_tree { NormalizedTree }
 import std.algebra { Cons, Empty, FreeMonoid }
 import v2.std.diagnostic { Outcome, outcome_accepted }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.provenance { SpanIndex, node_occurrence_id_optional, span_index_textual_locus_optional }
 import v2.std.text { String }
 import std.occurrence_identity {
diff --git a/src/v2/test/claim/qualified_name/declaration_reference_marker_test.dag b/src/v2/test/claim/qualified_name/declaration_reference_marker_test.dag
index bc7e6793bda..ea331c81038 100644
--- a/src/v2/test/claim/qualified_name/declaration_reference_marker_test.dag
+++ b/src/v2/test/claim/qualified_name/declaration_reference_marker_test.dag
@@ -5,7 +5,7 @@ import v2.extdeps.languages.dag { dag_int_literal_node_from_lexeme }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Conj, Edge, Authored, Node, TypeNode, node_subtree_nodes }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name {
   declaration_reference_node,
   declaration_reference_path_optional,
diff --git a/src/v2/test/claim/reference_derived_graph_call_arg_tree_test.dag b/src/v2/test/claim/reference_derived_graph_call_arg_tree_test.dag
index d524b05deb5..9202f872298 100644
--- a/src/v2/test/claim/reference_derived_graph_call_arg_tree_test.dag
+++ b/src/v2/test/claim/reference_derived_graph_call_arg_tree_test.dag
@@ -29,7 +29,7 @@ import v2.std.diagnostic {
 }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
 import v2.std.node { Edge, Node }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name { QualifiedName, qualified_name_to_dotted_string }
 import v2.std.text { String }
 import v2.test.claim.reference_derived_graph_fixture {
diff --git a/src/v2/test/claim/reference_derived_graph_fixture.dag b/src/v2/test/claim/reference_derived_graph_fixture.dag
index 122bfff2184..615c572a8b9 100644
--- a/src/v2/test/claim/reference_derived_graph_fixture.dag
+++ b/src/v2/test/claim/reference_derived_graph_fixture.dag
@@ -27,8 +27,8 @@ import v2.std.diagnostic {
 }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree }
 import v2.std.node { Symbol, node_subtree_nodes }
-import v2.std.optional { Optional }
-import v2.std.optional { Absent, Present }
+import std.optional { Optional }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 // ONE INGEST, TWO CLAIM FILES. Files under dag/test/fixture/reference_derived_graph are the
diff --git a/src/v2/test/claim/reference_derived_graph_production_ingest_test.dag b/src/v2/test/claim/reference_derived_graph_production_ingest_test.dag
index 7f489cfe684..23c29f8880b 100644
--- a/src/v2/test/claim/reference_derived_graph_production_ingest_test.dag
+++ b/src/v2/test/claim/reference_derived_graph_production_ingest_test.dag
@@ -28,7 +28,7 @@ import v2.std.node {
   NodeFold,
   StructuralLabel
 }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.qualified_name { qualified_name_to_dotted_string }
 import v2.std.text { String }
 import v2.test.claim.reference_derived_graph_fixture {
diff --git a/src/v2/test/claim/reference_derived_residency_reading_test.dag b/src/v2/test/claim/reference_derived_residency_reading_test.dag
index eddccb8eedd..206bdda0a43 100644
--- a/src/v2/test/claim/reference_derived_residency_reading_test.dag
+++ b/src/v2/test/claim/reference_derived_residency_reading_test.dag
@@ -32,7 +32,7 @@ import std.occurrence_identity { OccurrenceSynthetic }
 import v2.compiler.symbol_index_fill { symbol_index_fill_module_root }
 import v2.lens.reference_derived_residency_reading { carrier_reading_from_type_decl }
 import v2.std.diagnostic { Accepted, Rejected }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name { qualified_name_snoc }
 import v2.extdeps.languages.dag { qualified_name_from_module_node }
 import v2.std.symbol_index { empty_symbol_index, symbol_index_lookup }
diff --git a/src/v2/test/claim/reference_evidence/declaration_reference_evidence_test.dag b/src/v2/test/claim/reference_evidence/declaration_reference_evidence_test.dag
index d62071dd6e5..3841a9065f5 100644
--- a/src/v2/test/claim/reference_evidence/declaration_reference_evidence_test.dag
+++ b/src/v2/test/claim/reference_evidence/declaration_reference_evidence_test.dag
@@ -18,7 +18,7 @@ import v2.compiler.source_authority { SourceRootIngest }
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.node { Node, NodeFold, TypeNode, Atom, Arrow, ComputationNode, Transform, fold_node }
 import v2.std.node_query { find_named_child, node_positional_child_targets }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.collection { list_at_optional }
 import v2.std.qualified_name { QualifiedName, declaration_reference_node, declaration_reference_path_optional, parameter_reference_node }
 import v2.test.lens_common.infer_fixture { ClaimParam, ClaimRecord, claim_callable_arrow, claim_int_literal, claim_minted, claim_minted_atom, claim_record_declaration, claim_resolved_call_tree }
diff --git a/src/v2/test/claim/refinement_discharge_test.dag b/src/v2/test/claim/refinement_discharge_test.dag
index 68a160ed39f..121f036e720 100644
--- a/src/v2/test/claim/refinement_discharge_test.dag
+++ b/src/v2/test/claim/refinement_discharge_test.dag
@@ -8,7 +8,7 @@ import v2.extdeps.languages.dag { dag_arrow_with_body_node, dag_int_literal_fixt
 import v2.std.diagnostic { Accepted, Outcome, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { ComputationNode, Conj, Edge, Authored, Node, Positional, Symbol, Transform, TypeNode, node_synthetic }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.node_query { binder_edge }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/resolve/namespace_candidate_rule_test.dag b/src/v2/test/claim/resolve/namespace_candidate_rule_test.dag
index 4ea3c978351..4e99e642043 100644
--- a/src/v2/test/claim/resolve/namespace_candidate_rule_test.dag
+++ b/src/v2/test/claim/resolve/namespace_candidate_rule_test.dag
@@ -35,7 +35,7 @@ import v2.std.diagnostic {
 }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name { QualifiedName, qualified_name_from_dotted_string }
 import v2.std.symbol_index {
   GlobalBareHit,
diff --git a/src/v2/test/claim/resolve/single_tree_module_body_test.dag b/src/v2/test/claim/resolve/single_tree_module_body_test.dag
index e6c25955048..91af825e8f0 100644
--- a/src/v2/test/claim/resolve/single_tree_module_body_test.dag
+++ b/src/v2/test/claim/resolve/single_tree_module_body_test.dag
@@ -10,7 +10,7 @@ import v2.std.declaration_marker { test_marker_channel_empty }
 import v2.std.diagnostic { Accepted, None, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { Atom, Conj, Edge, Authored, Node, Symbol, TypeNode }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name { QualifiedName, qualified_name_spine_node }
 import v2.std.node_query { binder_edge }
 
diff --git a/src/v2/test/claim/self_host/ancestry_witness_test.dag b/src/v2/test/claim/self_host/ancestry_witness_test.dag
index d4011c9153d..651b70459f3 100644
--- a/src/v2/test/claim/self_host/ancestry_witness_test.dag
+++ b/src/v2/test/claim/self_host/ancestry_witness_test.dag
@@ -2,7 +2,7 @@ module v2.test.claim.self_host.ancestry_witness
 
 import std.content_hash { Sha512Digest, sha512_hex_digest }
 import v2.std.node { Hash, Symbol, symbol_identity_digest }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/test/claim/self_host/compiler_closure_emit_from_ingest_test.dag b/src/v2/test/claim/self_host/compiler_closure_emit_from_ingest_test.dag
index b2069793e59..1050a345d3f 100644
--- a/src/v2/test/claim/self_host/compiler_closure_emit_from_ingest_test.dag
+++ b/src/v2/test/claim/self_host/compiler_closure_emit_from_ingest_test.dag
@@ -32,7 +32,7 @@ import v2.compiler.self_host.compiler_closure_emit_driver {
 import v2.compiler.tokenize { tokenize }
 import v2.extdeps.languages.dag { dag_language_model }
 import v2.std.algebra { Empty, fold_list, length }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional
 }
diff --git a/src/v2/test/claim/self_host/direct_rust_door_fixture_containment_witness_test.dag b/src/v2/test/claim/self_host/direct_rust_door_fixture_containment_witness_test.dag
index 8c9a1c87ab4..2f429d56898 100644
--- a/src/v2/test/claim/self_host/direct_rust_door_fixture_containment_witness_test.dag
+++ b/src/v2/test/claim/self_host/direct_rust_door_fixture_containment_witness_test.dag
@@ -15,7 +15,7 @@ import v2.compiler.self_host.direct_rust_door_fixture {
   direct_rust_door_target_model
 }
 import v2.std.diagnostic { Accepted, Rejected }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 // wise-ram-22 PR1 containment: fixture synthetic mint returns SyntheticEmittedArtifact with
diff --git a/src/v2/test/claim/self_host/direct_rust_door_group_algebra_test.dag b/src/v2/test/claim/self_host/direct_rust_door_group_algebra_test.dag
index e98b82658ae..288c55511fc 100644
--- a/src/v2/test/claim/self_host/direct_rust_door_group_algebra_test.dag
+++ b/src/v2/test/claim/self_host/direct_rust_door_group_algebra_test.dag
@@ -77,7 +77,7 @@ import v2.std.diagnostic {
   invariant_port_locus,
 }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 
 // FAST lane: discriminates the direct-rust-door group ALGEBRA over PLANTED observations, paying
diff --git a/src/v2/test/claim/self_host/frontier_probe_overlap_detail_test.dag b/src/v2/test/claim/self_host/frontier_probe_overlap_detail_test.dag
index eb59883e062..9ca8b0bbc87 100644
--- a/src/v2/test/claim/self_host/frontier_probe_overlap_detail_test.dag
+++ b/src/v2/test/claim/self_host/frontier_probe_overlap_detail_test.dag
@@ -35,7 +35,7 @@ import v2.compiler.self_host.frontier_probe_types {
   frontier_probe_receipt_without_assemble_detail,
   RealizationGap
 }
-import v2.std.optional { Absent, Present, optional_absent, optional_present }
+import std.optional { Absent, Present, optional_absent, optional_present }
 import v2.std.algebra { Cons, Empty, length }
 
 fn sample_overlap_row() -> GrammarChoiceAmbiguityRow {
diff --git a/src/v2/test/claim/self_host/kernel_optional_mint_binding_test.dag b/src/v2/test/claim/self_host/kernel_optional_mint_binding_test.dag
index 572f9b65eb1..ce352e1162f 100644
--- a/src/v2/test/claim/self_host/kernel_optional_mint_binding_test.dag
+++ b/src/v2/test/claim/self_host/kernel_optional_mint_binding_test.dag
@@ -10,7 +10,7 @@ import std.literal_elaboration {
   kernel_mint_ownership
 }
 import gunbc.structural_realization_bindings { kernel_mint_declaration_rows }
-import v2.std.optional { Optional, Present, Absent, optional_present, optional_absent }
+import std.optional { Optional, Present, Absent, optional_present, optional_absent }
 
 // THE SEED'S KERNEL OPTIONAL IS v2.std.optional Optional (Optional de-fork, binding step). These
 // claims hold the decision at the row interface: which declaration a kernel mint stands for is
@@ -22,7 +22,7 @@ import v2.std.optional { Optional, Present, Absent, optional_present, optional_a
 test fn kernel_optional_mint_is_bound_to_the_one_declaration() -> Bool {
   match kernel_mint_declaration_for(rows: kernel_mint_declaration_rows, minted_name: "Optional") {
     KernelMintDeclarationFound { declaration: d } =>
-      declaration_ref_eq(a: d, b: decl_ref(module_path: "v2.std.optional", decl_name: "Optional"))
+      declaration_ref_eq(a: d, b: decl_ref(module_path: "std.optional", decl_name: "Optional"))
     KernelMintDeclarationAbsent => false
     KernelMintDeclarationAmbiguous { row_count: _ } => false
   }
@@ -62,7 +62,7 @@ test fn a_mint_bound_twice_is_ambiguous() -> Bool {
 // arm's declaration the one the kernel optional stands for. The bound declaration owns it; another
 // declaration does not.
 test fn the_bound_declaration_owns_the_kernel_optional() -> Bool {
-  match kernel_mint_ownership(rows: kernel_mint_declaration_rows, minted_name: "Optional", declaration: decl_ref(module_path: "v2.std.optional", decl_name: "Optional")) {
+  match kernel_mint_ownership(rows: kernel_mint_declaration_rows, minted_name: "Optional", declaration: decl_ref(module_path: "std.optional", decl_name: "Optional")) {
     DeclarationOwnsTheMint => true
     DeclarationDoesNotOwnTheMint => false
     KernelMintOwnershipAmbiguous { row_count: _ } => false
@@ -82,7 +82,7 @@ test fn another_declaration_does_not_own_the_kernel_optional() -> Bool {
 // lowering to the host option, which is the state a yes/no form of this question produced.
 test fn an_ambiguously_bound_mint_is_refused_not_answered() -> Bool {
   let doubled = concat(kernel_mint_declaration_rows, kernel_mint_declaration_rows)
-  match kernel_mint_ownership(rows: doubled, minted_name: "Optional", declaration: decl_ref(module_path: "v2.std.optional", decl_name: "Optional")) {
+  match kernel_mint_ownership(rows: doubled, minted_name: "Optional", declaration: decl_ref(module_path: "std.optional", decl_name: "Optional")) {
     DeclarationOwnsTheMint => false
     DeclarationDoesNotOwnTheMint => false
     KernelMintOwnershipAmbiguous { row_count: n } => n == 2
diff --git a/src/v2/test/claim/self_host/native_agreement_rejected_actual_test.dag b/src/v2/test/claim/self_host/native_agreement_rejected_actual_test.dag
index c0875a10868..5e96b5df315 100644
--- a/src/v2/test/claim/self_host/native_agreement_rejected_actual_test.dag
+++ b/src/v2/test/claim/self_host/native_agreement_rejected_actual_test.dag
@@ -13,7 +13,7 @@ import v2.std.diagnostic {
   diagnostics_singleton
 }
 import v2.std.node { Node, TypeNode, Atom, OccurrenceSynthetic }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.runtime { RuntimeValue, RuntimePrimitive, RuntimePrimitiveValue }
 import v2.std.machine { Byte }
 import v2.std.host_run { ValueDiff }
diff --git a/src/v2/test/claim/self_host_contract/target_carriers_emitted_contract_test.dag b/src/v2/test/claim/self_host_contract/target_carriers_emitted_contract_test.dag
index 095d4f2d854..c145ab2c53b 100644
--- a/src/v2/test/claim/self_host_contract/target_carriers_emitted_contract_test.dag
+++ b/src/v2/test/claim/self_host_contract/target_carriers_emitted_contract_test.dag
@@ -5,7 +5,7 @@ import extdeps.communication.medium { DecodeFidelity, Lossless, Lossy }
 import v2.compiler.target_carriers { bundle_fidelity_quotient_optional, fidelity_quotient_decode_fidelity }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.node { Node, Edge, Authored, Positional, Atom, TypeNode, ComputationNode, Conj, Value, Symbol, node_synthetic }
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 
 // THE 07_target_carriers ROW'S CONTRACT, STATED ONCE AND REALIZED TWICE. Read off the authority:
 // v2.compiler.target_carriers fidelity_quotient_decode_fidelity folds a target's fidelity quotient
diff --git a/src/v2/test/claim/service_realization_conformance_test.dag b/src/v2/test/claim/service_realization_conformance_test.dag
index c095ac83ef3..fda1cdc6e06 100644
--- a/src/v2/test/claim/service_realization_conformance_test.dag
+++ b/src/v2/test/claim/service_realization_conformance_test.dag
@@ -22,7 +22,7 @@ import v2.std.operation_argv { ArgvEmpty, ArgvExpressionUnsupported, ArgvRefusal
 import v2.std.symbol_index { SymbolIndex, empty_symbol_index, symbol_index_lookup }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Optional, Present, optional_absent }
+import std.optional { Absent, Optional, Present, optional_absent }
 import std.types { List }
 import v2.std.text { String }
 import std.algebra { Cons, Empty }
diff --git a/src/v2/test/claim/sql_create_table_fold_test.dag b/src/v2/test/claim/sql_create_table_fold_test.dag
index 77a488e4e7f..4879ae33c44 100644
--- a/src/v2/test/claim/sql_create_table_fold_test.dag
+++ b/src/v2/test/claim/sql_create_table_fold_test.dag
@@ -32,7 +32,7 @@ import v2.std.compilers.target_model { TargetModel }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/test/claim/staged_front_end_test.dag b/src/v2/test/claim/staged_front_end_test.dag
index 29865f2e0e9..346b82d5be5 100644
--- a/src/v2/test/claim/staged_front_end_test.dag
+++ b/src/v2/test/claim/staged_front_end_test.dag
@@ -16,7 +16,7 @@ import v2.compiler.staged_front_end {
 }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.text { String }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
diff --git a/src/v2/test/claim/tokenize/byte_range_octet_unit_test.dag b/src/v2/test/claim/tokenize/byte_range_octet_unit_test.dag
index 75d7489eecb..8e8384094f3 100644
--- a/src/v2/test/claim/tokenize/byte_range_octet_unit_test.dag
+++ b/src/v2/test/claim/tokenize/byte_range_octet_unit_test.dag
@@ -1,7 +1,7 @@
 module v2.test.tokenize.byte_range_octet_unit
 
 import v2.std.text { String }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.algebra { fold_list }
 import v2.std.compilers.lexing { ModeledLexRules, Token, TokenStream }
 import v2.compiler.tokenize { tokenize }
diff --git a/src/v2/test/claim/translate_underived_refusal_test.dag b/src/v2/test/claim/translate_underived_refusal_test.dag
index 430ef2b7bbe..251a9773547 100644
--- a/src/v2/test/claim/translate_underived_refusal_test.dag
+++ b/src/v2/test/claim/translate_underived_refusal_test.dag
@@ -64,7 +64,7 @@ import v2.std.node {
   content_hash,
   node_rebuild,
 }
-import v2.std.optional { Absent, Optional, optional_absent }
+import std.optional { Absent, Optional, optional_absent }
 import v2.test.complexity_gate.table_fixture_add_subject_producer {
   table_fixture_add_arrow_with_body
 }
diff --git a/src/v2/test/claim/type_param_binder_frame_test.dag b/src/v2/test/claim/type_param_binder_frame_test.dag
index 488b67506b4..4259c5c3017 100644
--- a/src/v2/test/claim/type_param_binder_frame_test.dag
+++ b/src/v2/test/claim/type_param_binder_frame_test.dag
@@ -45,7 +45,7 @@ import v2.std.node {
   core_edge_label,
 }
 import v2.std.text { String }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.type_binder {
   type_binder_set_children,
   OpaqueTypeDecl,
diff --git a/src/v2/test/claim/undecidable_verdict_collapse_wall_test.dag b/src/v2/test/claim/undecidable_verdict_collapse_wall_test.dag
index 004c773deca..2b161875edb 100644
--- a/src/v2/test/claim/undecidable_verdict_collapse_wall_test.dag
+++ b/src/v2/test/claim/undecidable_verdict_collapse_wall_test.dag
@@ -6,7 +6,7 @@ import v2.lens.undecidable_verdict_collapse {
   undecidable_verdict_collapse_compile_gate,
   undecidable_verdict_collapse_findings
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.qualified_name { qualified_name_from_dotted_string }
 import v2.extdeps.languages.dag {
   dag_match_arm_node,
diff --git a/src/v2/test/claim/value_base_projection_test.dag b/src/v2/test/claim/value_base_projection_test.dag
index 8198b509364..069dae0bd13 100644
--- a/src/v2/test/claim/value_base_projection_test.dag
+++ b/src/v2/test/claim/value_base_projection_test.dag
@@ -8,7 +8,7 @@ import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
 import v2.std.node { ComputationNode, Node, Symbol, Transform, node_subtree_nodes }
 import v2.std.node_query { field_projection_optional }
 import v2.std.qualified_name { declaration_reference_path_optional, parameter_reference_path_optional, qualified_name_to_dotted_string }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/claim/wrap_decision_predicate_test.dag b/src/v2/test/claim/wrap_decision_predicate_test.dag
index 0f56ce1faa7..bc72816f085 100644
--- a/src/v2/test/claim/wrap_decision_predicate_test.dag
+++ b/src/v2/test/claim/wrap_decision_predicate_test.dag
@@ -37,7 +37,7 @@ import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.node { Node }
 import v2.std.collection { list_at_optional }
 import v2.std.node_query { node_positional_child_targets }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // Derisk witnesses for rc-ownership-wrap-decision-design.md: wrap_decision_gate is the single
 // authority for Rc/Box/owned type wrapping at ONE emit position, and wrap_decision_flow_gate is the
diff --git a/src/v2/test/compiler/pipeline/stage_bridge.dag b/src/v2/test/compiler/pipeline/stage_bridge.dag
index a6d7ec5bb42..18d6b5c56bd 100644
--- a/src/v2/test/compiler/pipeline/stage_bridge.dag
+++ b/src/v2/test/compiler/pipeline/stage_bridge.dag
@@ -18,7 +18,7 @@ import v2.extdeps.languages.rust { rust_target_model }
 import v2.std.collection {
   list_at_optional
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/test/floor_changed_witness_test.dag b/src/v2/test/floor_changed_witness_test.dag
index 68d4e16f60b..7aae0737baa 100644
--- a/src/v2/test/floor_changed_witness_test.dag
+++ b/src/v2/test/floor_changed_witness_test.dag
@@ -6,7 +6,7 @@ import v2.workflow.wet_evidence {
   WetEvidenceBinding, CoResidentPreparedSubject,
 }
 
-import v2.std.optional { Present, Absent }
+import std.optional { Present, Absent }
 import v2.workflow.floor_changed_witness {
   ChangedWitnessExecutionStanding,
   HermeticRouteGapWetEvidence, HermeticRouteGapWetUnavailable, HermeticRouteGapWetAdmitted,
diff --git a/src/v2/test/lens_common/infer_fixture.dag b/src/v2/test/lens_common/infer_fixture.dag
index e8bd1019cec..c6d2cca2bd4 100644
--- a/src/v2/test/lens_common/infer_fixture.dag
+++ b/src/v2/test/lens_common/infer_fixture.dag
@@ -1,5 +1,5 @@
 module v2.test.lens_common.infer_fixture
-import v2.std.optional { optional_absent }
+import std.optional { optional_absent }
 
 import std.occurrence_identity { OccurrenceSynthetic }
 import v2.compiler.resolve { ClosureProviderRefusal, ResolvedTree }
@@ -12,7 +12,7 @@ import v2.std.constraints {
   CanonicalGroundingWitness
 }
 import v2.std.node { Atom, Node, Symbol, TypeNode }
-import v2.std.optional { Present }
+import std.optional { Present }
 import v2.std.witness { Holds, StructuralPropertyWitness, Witness, witness_from_optional }
 
 import v2.compiler.body_lowering_fold { body_lower_callable_arrow }
@@ -24,7 +24,7 @@ import v2.std.qualified_name { QualifiedName, declaration_reference_node, parame
 import std.occurrence_identity { NodeOccurrenceIdentity, OccurrenceId, OccurrenceMinted }
 import v2.std.node { Authored, ComputationNode, Conj, Edge, Positional, Transform }
 import v2.std.diagnostic { Accepted, Rejected }
-import v2.std.optional { Absent, optional_present }
+import std.optional { Absent, optional_present }
 import v2.std.algebra { list_append, list_map }
 import std.algebra { Cons }
 
diff --git a/src/v2/test/lens_common/resolve_fixture.dag b/src/v2/test/lens_common/resolve_fixture.dag
index 209656f853a..89afbc34d53 100644
--- a/src/v2/test/lens_common/resolve_fixture.dag
+++ b/src/v2/test/lens_common/resolve_fixture.dag
@@ -20,7 +20,7 @@ import v2.std.qualified_name { QualifiedName }
 import v2.std.node { Atom, Authored, Conj, Edge, Node, Symbol, TypeNode, allocate_pending_occurrences, content_hash, node_occurrence_allocator_after, node_with_occurrence_id }
 import std.occurrence_identity { NodeOccurrenceIdentity, OccurrenceId, OccurrenceMinted, OccurrenceSynthetic, scoped_occurrence_allocator }
 import v2.std.diagnostic { Accepted, None, Outcome, Rejected, bind_outcome, outcome_accepted }
-import v2.std.optional { optional_present }
+import std.optional { optional_present }
 import v2.std.algebra { fold_list_node, list_map }
 import v2.std.collection { List }
 import v2.std.integer { Int }
diff --git a/src/v2/test/lens_determinism/reach_witness_test.dag b/src/v2/test/lens_determinism/reach_witness_test.dag
index 44fca4f749f..c46242b02ff 100644
--- a/src/v2/test/lens_determinism/reach_witness_test.dag
+++ b/src/v2/test/lens_determinism/reach_witness_test.dag
@@ -32,7 +32,7 @@ import v2.std.node {
 }
 import v2.std.witness { Holds, Violates, Witness }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 data live_tree_disposition: LiveTreeDisposition = SubstrateInputsOnly
 
diff --git a/src/v2/test/lens_structural_resolution/facts_lookup_miss.dag b/src/v2/test/lens_structural_resolution/facts_lookup_miss.dag
index e895b928000..225f7cccb3d 100644
--- a/src/v2/test/lens_structural_resolution/facts_lookup_miss.dag
+++ b/src/v2/test/lens_structural_resolution/facts_lookup_miss.dag
@@ -6,7 +6,7 @@ import v2.std.dependency { DependencyView }
 
 import v2.std.node { Authored }
 import v2.std.collection { Map, optional_absent, optional_present }
-import v2.std.optional { Optional, Absent, Present }
+import std.optional { Optional, Absent, Present }
 import v2.std.dependency { BindsTo, ClassifiedDependencyView, DependencyView }
 import v2.test.lens_structural_resolution.claim_carrier { LensStructuralResolutionClaim, lens_structural_resolution_actual }
 
diff --git a/src/v2/test/lens_structural_resolution/unbound_symbol_at_use.dag b/src/v2/test/lens_structural_resolution/unbound_symbol_at_use.dag
index 359f9a68cfe..c4cd2ccbd86 100644
--- a/src/v2/test/lens_structural_resolution/unbound_symbol_at_use.dag
+++ b/src/v2/test/lens_structural_resolution/unbound_symbol_at_use.dag
@@ -6,7 +6,7 @@ import v2.std.dependency { DependencyView }
 
 import v2.std.node { Authored }
 import v2.std.collection { Map, optional_absent, optional_present }
-import v2.std.optional { Optional, Absent, Present }
+import std.optional { Optional, Absent, Present }
 import v2.std.dependency { BindsTo, ClassifiedDependencyView, DependencyView }
 import v2.test.lens_structural_resolution.claim_carrier { LensStructuralResolutionClaim, lens_structural_resolution_actual }
 
diff --git a/src/v2/test/lens_structural_resolution/unresolved_infer_witness.dag b/src/v2/test/lens_structural_resolution/unresolved_infer_witness.dag
index a04b1fc09c8..e1f353f0d87 100644
--- a/src/v2/test/lens_structural_resolution/unresolved_infer_witness.dag
+++ b/src/v2/test/lens_structural_resolution/unresolved_infer_witness.dag
@@ -6,7 +6,7 @@ import v2.test.lens_structural_resolution.claim_carrier { LensStructuralResoluti
 
 import v2.std.node { Authored }
 import v2.std.collection { Map, optional_absent, optional_present }
-import v2.std.optional { Optional, Absent, Present }
+import std.optional { Optional, Absent, Present }
 import v2.std.dependency { BindsTo, ClassifiedDependencyView, DependencyView }
 import v2.test.lens_structural_resolution.claim_carrier { LensStructuralResolutionClaim, lens_structural_resolution_actual }
 
diff --git a/src/v2/test/native_decl_selection_test.dag b/src/v2/test/native_decl_selection_test.dag
index 01a3a1a07f7..3818bab52f8 100644
--- a/src/v2/test/native_decl_selection_test.dag
+++ b/src/v2/test/native_decl_selection_test.dag
@@ -32,7 +32,7 @@ import v2.std.cross_tree.import_model { DagTree }
 import v2.std.diagnostic { Accepted, Outcome, Rejected, diagnostics_fatal_reason }
 import v2.std.algebra { fold_list, length }
 import v2.std.node { Symbol }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.std.qualified_name { QualifiedName }
 import extdeps.communication.medium { Lossless, Medium }
 
diff --git a/src/v2/test/native_file_refusal_locus_test.dag b/src/v2/test/native_file_refusal_locus_test.dag
index 84650761a2d..30dcaa4ba95 100644
--- a/src/v2/test/native_file_refusal_locus_test.dag
+++ b/src/v2/test/native_file_refusal_locus_test.dag
@@ -12,7 +12,7 @@ import v2.std.diagnostic {
 import std.algebra { Cons, Empty }
 import v2.std.integer { Int }
 import v2.std.provenance { span_index_empty }
-import v2.std.optional { optional_absent }
+import std.optional { optional_absent }
 import v2.std.node { Symbol }
 
 fn at_text(file: Symbol, start: Int) -> Diagnostic {
diff --git a/src/v2/test/v2_native_route_test.dag b/src/v2/test/v2_native_route_test.dag
index a65b33b6423..62282253d3f 100644
--- a/src/v2/test/v2_native_route_test.dag
+++ b/src/v2/test/v2_native_route_test.dag
@@ -70,7 +70,7 @@ import v2.compiler.native_test_vocabulary {
   FileRefusalLink,
   FileRefusalAtWholeFile
 }
-import v2.std.optional { Absent, Optional, Present, optional_present, optional_absent }
+import std.optional { Absent, Optional, Present, optional_present, optional_absent }
 import v2.std.diagnostic {
   Accepted, Outcome, Rejected, invariant_port_locus, Diagnostic, NonEmptyDiagnostics, Unavailable, ExternalContractUnknown
 }
diff --git a/src/v2/workflow/body_lowering_retention_census.dag b/src/v2/workflow/body_lowering_retention_census.dag
index 90797b31403..55033082ca5 100644
--- a/src/v2/workflow/body_lowering_retention_census.dag
+++ b/src/v2/workflow/body_lowering_retention_census.dag
@@ -39,7 +39,7 @@ import v2.std.node {
   Value,
   symbol_lexeme,
 }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 
 // WHY THIS IS NOT "COUNT THE WRAPPER-RETAINED DIAGNOSTICS".
 //
diff --git a/src/v2/workflow/compile_door_cause_ownership.dag b/src/v2/workflow/compile_door_cause_ownership.dag
index aa9587a46b4..e8d0bcf3bf7 100644
--- a/src/v2/workflow/compile_door_cause_ownership.dag
+++ b/src/v2/workflow/compile_door_cause_ownership.dag
@@ -1,7 +1,7 @@
 module v2.workflow.compile_door_cause_ownership
 
 import v2.std.node { Symbol }
-import v2.std.optional { Optional, Present, Absent, optional_present, optional_absent }
+import std.optional { Optional, Present, Absent, optional_present, optional_absent }
 import v2.std.algebra { list_find_first }
 import std.types { String, List }
 import v2.std.integer { Int }
diff --git a/src/v2/workflow/compile_door_ledger.dag b/src/v2/workflow/compile_door_ledger.dag
index a667ec23829..91b848e44ca 100644
--- a/src/v2/workflow/compile_door_ledger.dag
+++ b/src/v2/workflow/compile_door_ledger.dag
@@ -28,7 +28,7 @@ import v2.workflow.floor_diff_observe {
   floor_observe_git_diff_name_status_for_ci
 }
 import v2.std.artifact { Artifact, SourceFile }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/workflow/dag_acceptance.dag b/src/v2/workflow/dag_acceptance.dag
index 50677b4aacb..3a3daec5ec0 100644
--- a/src/v2/workflow/dag_acceptance.dag
+++ b/src/v2/workflow/dag_acceptance.dag
@@ -37,7 +37,7 @@ import v2.std.leaf_model_verification {
   TargetCompileVerdict
 }
 import v2.std.node { Node, Symbol, node_subtree_count }
-import v2.std.optional { Absent, Optional, Present, optional_absent, optional_present }
+import std.optional { Absent, Optional, Present, optional_absent, optional_present }
 import v2.compiler.refinement_discharge { infer_and_discharge }
 import v2.compiler.resolve { ResolvedTree }
 
diff --git a/src/v2/workflow/effect_plan_bash_materialize.dag b/src/v2/workflow/effect_plan_bash_materialize.dag
index bc6a3516f74..a56242ee26d 100644
--- a/src/v2/workflow/effect_plan_bash_materialize.dag
+++ b/src/v2/workflow/effect_plan_bash_materialize.dag
@@ -56,7 +56,7 @@ import v2.std.operation_argv {
   operation_argv_cause_label,
   operation_argv_ref_label
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/workflow/emitted_closure_crate_partition.dag b/src/v2/workflow/emitted_closure_crate_partition.dag
index 26a6e1b4c6f..4f0a816e80e 100644
--- a/src/v2/workflow/emitted_closure_crate_partition.dag
+++ b/src/v2/workflow/emitted_closure_crate_partition.dag
@@ -12,7 +12,7 @@ import v2.lens.module_graph {
 }
 import v2.std.collection { empty_map, map_get, map_insert }
 import v2.std.diagnostic { Accepted, Rejected }
-import v2.std.optional { Absent, Optional, Present }
+import std.optional { Absent, Optional, Present }
 import v2.std.compilers.compilation_unit { ModuleDag, ModuleDagEdge, ModuleId }
 import v2.workflow.rust_crate_partition {
   PartitionPolicy,
diff --git a/src/v2/workflow/emitted_crate_workspace.dag b/src/v2/workflow/emitted_crate_workspace.dag
index 1e1cbb188f9..f090819e8a1 100644
--- a/src/v2/workflow/emitted_crate_workspace.dag
+++ b/src/v2/workflow/emitted_crate_workspace.dag
@@ -2,7 +2,7 @@ module v2.workflow.emitted_crate_workspace
 
 import std.types { List, String, Bool, Int, NonEmptyStr }
 import v2.std.collection { empty_map, map_get, map_insert }
-import v2.std.optional { Absent, Optional, Present, optional_present }
+import std.optional { Absent, Optional, Present, optional_present }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.compilers.compilation_unit {
   CompilationUnitId,
diff --git a/src/v2/workflow/floor_cost_debt_edit.dag b/src/v2/workflow/floor_cost_debt_edit.dag
index 7b5293af744..7c853b7230c 100644
--- a/src/v2/workflow/floor_cost_debt_edit.dag
+++ b/src/v2/workflow/floor_cost_debt_edit.dag
@@ -4,7 +4,7 @@ import v2.compiler.tokenize { tokenize }
 import v2.extdeps.languages.dag { dag_language_model }
 import v2.std.compilers.lexing { LexRules, Token, token_stream_all }
 import v2.std.algebra { Cons, Empty, any, contains, ListHeadResult, HeadFound, HeadAbsent, list_head, ListTailResult, TailFound, TailAbsent, list_tail, list_reverse }
-import v2.std.optional { Optional, Absent, Present, optional_absent, optional_present }
+import std.optional { Optional, Absent, Present, optional_absent, optional_present }
 import v2.std.diagnostic { Accepted, Rejected }
 import v2.std.integer { Int }
 import v2.std.node { Symbol }
diff --git a/src/v2/workflow/floor_diff_observe.dag b/src/v2/workflow/floor_diff_observe.dag
index c637ef40d2b..38b57276e37 100644
--- a/src/v2/workflow/floor_diff_observe.dag
+++ b/src/v2/workflow/floor_diff_observe.dag
@@ -34,7 +34,7 @@ import gunbc.diff_baseline {
 import std.types { String, NonEmptyStr, GitRef, FilePath, Map }
 import std.logic { Bool }
 import v2.std.collection { empty_map, map_insert, map_lookup }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.workflow.floor_naming_hygiene { floor_discovery_scan_test_decl_names }
 import extdeps.git
 import extdeps.git.inspect
diff --git a/src/v2/workflow/floor_discovery.dag b/src/v2/workflow/floor_discovery.dag
index bfc887c20ac..c73b6cbb741 100644
--- a/src/v2/workflow/floor_discovery.dag
+++ b/src/v2/workflow/floor_discovery.dag
@@ -20,7 +20,7 @@ import v2.workflow.floor_naming_hygiene {
   floor_wire_contract_sidecar_suffix
 }
 import std.types { String, Bool, List }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/workflow/floor_discovery_producer.dag b/src/v2/workflow/floor_discovery_producer.dag
index f24d5c9a143..62b59bb8222 100644
--- a/src/v2/workflow/floor_discovery_producer.dag
+++ b/src/v2/workflow/floor_discovery_producer.dag
@@ -27,7 +27,7 @@ import v2.workflow.floor_discovery_source_authority {
   floor_discovery_walk_state_zero
 }
 import v2.workflow.witness_admission { witness_row_excluded_from_discovery }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/workflow/floor_discovery_row.dag b/src/v2/workflow/floor_discovery_row.dag
index fcef393d8c9..adfec3281d3 100644
--- a/src/v2/workflow/floor_discovery_row.dag
+++ b/src/v2/workflow/floor_discovery_row.dag
@@ -2,7 +2,7 @@ module v2.workflow.floor_discovery_row
 
 import std.types { String, Bool, List }
 import v2.std.live_tree { LiveTreeDisposition }
-import v2.std.optional { Optional, optional_absent, optional_present }
+import std.optional { Optional, optional_absent, optional_present }
 import v2.workflow.floor_naming_hygiene {
   floor_test_marked_decl_allowed_in_entry,
   floor_test_sidecar_suffix,
diff --git a/src/v2/workflow/floor_discovery_source_authority.dag b/src/v2/workflow/floor_discovery_source_authority.dag
index fea16709b52..7be737c56de 100644
--- a/src/v2/workflow/floor_discovery_source_authority.dag
+++ b/src/v2/workflow/floor_discovery_source_authority.dag
@@ -7,7 +7,7 @@ import std.dissolution { DissolutionCondition, unbound_dissolution }
 import std.types { String, Int, List }
 import v2.std.algebra { any, length, fold_list }
 import v2.std.live_tree { LiveTreeDisposition, ReadsLiveTree, SubstrateInputsOnly }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/workflow/floor_discovery_transport.dag b/src/v2/workflow/floor_discovery_transport.dag
index 807bbb38239..b6d47863db7 100644
--- a/src/v2/workflow/floor_discovery_transport.dag
+++ b/src/v2/workflow/floor_discovery_transport.dag
@@ -10,7 +10,7 @@ import v2.workflow.floor_discovery {
   FloorDiscoverySubjectMismatch,
   floor_discovery_request_identity,
 }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // The transport is a host-effect boundary, not a second discovery implementation. It sequences the
 // existing typed Git/filesystem observations and hands their results to
diff --git a/src/v2/workflow/floor_grandfathered_roster.dag b/src/v2/workflow/floor_grandfathered_roster.dag
index b86680e9453..f358282b043 100644
--- a/src/v2/workflow/floor_grandfathered_roster.dag
+++ b/src/v2/workflow/floor_grandfathered_roster.dag
@@ -1,7 +1,7 @@
 module v2.workflow.floor_grandfathered_roster
 
 import v2.std.algebra { Cons, Empty, list_flat_map, length, contains, filter }
-import v2.std.optional { Optional, Absent, Present, optional_absent, optional_present }
+import std.optional { Optional, Absent, Present, optional_absent, optional_present }
 import v2.std.text { String }
 import v2.std.integer { Int }
 import std.dissolution { DissolutionCondition, unbound_dissolution }
diff --git a/src/v2/workflow/floor_naming_hygiene.dag b/src/v2/workflow/floor_naming_hygiene.dag
index c5365ace363..824622a8123 100644
--- a/src/v2/workflow/floor_naming_hygiene.dag
+++ b/src/v2/workflow/floor_naming_hygiene.dag
@@ -3,7 +3,7 @@ module v2.workflow.floor_naming_hygiene
 import std.algebra { trim }
 
 import std.types { String, Bool, List }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/workflow/floor_preparation.dag b/src/v2/workflow/floor_preparation.dag
index fbf2f6f100b..41a5aae7161 100644
--- a/src/v2/workflow/floor_preparation.dag
+++ b/src/v2/workflow/floor_preparation.dag
@@ -29,7 +29,7 @@ import v2.workflow.floor_discovery {
   floor_discovery_request_identity,
 }
 import v2.std.algebra { list_reverse }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 
 // The prepared floor subject is an opaque semantic identity over the exact discovery request,
 // selected witness identities, and the existing std.materialization_provider ResolveClosureRequest
diff --git a/src/v2/workflow/floor_pure_producer_share.dag b/src/v2/workflow/floor_pure_producer_share.dag
index 7135470dd24..5a618632a1c 100644
--- a/src/v2/workflow/floor_pure_producer_share.dag
+++ b/src/v2/workflow/floor_pure_producer_share.dag
@@ -871,7 +871,7 @@ data floor_single_claim_fill_debt: List<SingleClaimFillDebtModule> = [
     module: "v2.test.claim.coercion.identity_cast_emission_route",
     claims: [
       SingleClaimFillDebtClaim { claim: "a_cast_with_no_witness_refuses_before_realization_holds", standing: ActiveFillDebt },
-      SingleClaimFillDebtClaim { claim: "an_admitted_identity_cast_emits_through_the_closure_route_holds", standing: ActiveFillDebt }
+      SingleClaimFillDebtClaim { claim: "an_admitted_identity_cast_emits_through_the_closure_route_holds", standing: RetiredFillDebt { disposition: BecameSharedByDemand } }
     ]
   },
   SingleClaimFillDebtModule {
diff --git a/src/v2/workflow/floor_unimported_bare_provider_debt.dag b/src/v2/workflow/floor_unimported_bare_provider_debt.dag
index 39353f6a362..dc9f987ac63 100644
--- a/src/v2/workflow/floor_unimported_bare_provider_debt.dag
+++ b/src/v2/workflow/floor_unimported_bare_provider_debt.dag
@@ -1,7 +1,7 @@
 module v2.workflow.floor_unimported_bare_provider_debt
 
 import v2.std.collection { Map, empty_map, map_insert, map_lookup }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.text { String }
 import std.types { GitRef, FilePath, List }
 import extdeps.git
diff --git a/src/v2/workflow/floor_unimported_bare_provider_debt_roster.dag b/src/v2/workflow/floor_unimported_bare_provider_debt_roster.dag
index 6d5dfd80262..012b7674c86 100644
--- a/src/v2/workflow/floor_unimported_bare_provider_debt_roster.dag
+++ b/src/v2/workflow/floor_unimported_bare_provider_debt_roster.dag
@@ -352,7 +352,7 @@ data unimported_bare_provider_dispositions: List<UnimportedBareProviderDispositi
   UnimportedBareProviderDisposition { file: "dag/extdeps/tools/sha256sum.dag", name: "get", standing: Retired { cause: NotAReference } },
   UnimportedBareProviderDisposition { file: "dag/extdeps/unicode/display.dag", name: "any", standing: Retired { cause: BindsWithoutDeclaration } },
   UnimportedBareProviderDisposition { file: "dag/extdeps/unicode/display.dag", name: "contains", standing: Retired { cause: BindsWithoutDeclaration } },
-  UnimportedBareProviderDisposition { file: "dag/extdeps/uri.dag", name: "Optional", standing: ActiveDebt },
+  UnimportedBareProviderDisposition { file: "dag/extdeps/uri.dag", name: "Optional", standing: Retired { cause: ImportsFixed } },
   UnimportedBareProviderDisposition { file: "dag/extdeps/uri.dag", name: "contains", standing: Retired { cause: NotAReference } },
   UnimportedBareProviderDisposition { file: "dag/extdeps/uri.dag", name: "length", standing: Retired { cause: NotAReference } },
   UnimportedBareProviderDisposition { file: "dag/extdeps/uri.dag", name: "skip", standing: Retired { cause: NotAReference } },
@@ -777,7 +777,7 @@ data unimported_bare_provider_dispositions: List<UnimportedBareProviderDispositi
   UnimportedBareProviderDisposition { file: "dag/gunbc/runner/runner_provider_survey.dag", name: "filter", standing: Retired { cause: BindsWithoutDeclaration } },
   UnimportedBareProviderDisposition { file: "dag/gunbc/runner/runner_shape_census.dag", name: "filter", standing: Retired { cause: BindsWithoutDeclaration } },
   UnimportedBareProviderDisposition { file: "dag/gunbc/runner/runner_slot_population_census.dag", name: "ends_with", standing: Retired { cause: ImportsFixed } },
-  UnimportedBareProviderDisposition { file: "dag/gunbc/rust_crate_package_ident.dag", name: "Optional", standing: ActiveDebt },
+  UnimportedBareProviderDisposition { file: "dag/gunbc/rust_crate_package_ident.dag", name: "Optional", standing: Retired { cause: ImportsFixed } },
   UnimportedBareProviderDisposition { file: "dag/gunbc/rust_crate_package_ident.dag", name: "any", standing: Retired { cause: NotAReference } },
   UnimportedBareProviderDisposition { file: "dag/gunbc/scm/object_store.dag", name: "empty_map", standing: Retired { cause: ImportsFixed } },
   UnimportedBareProviderDisposition { file: "dag/gunbc/scm/object_store.dag", name: "length", standing: Retired { cause: ImportsFixed } },
@@ -901,7 +901,7 @@ data unimported_bare_provider_dispositions: List<UnimportedBareProviderDispositi
   UnimportedBareProviderDisposition { file: "dag/std/decision.dag", name: "any", standing: Retired { cause: ImportsFixed } },
   UnimportedBareProviderDisposition { file: "dag/std/decision.dag", name: "filter", standing: Retired { cause: ImportsFixed } },
   UnimportedBareProviderDisposition { file: "dag/std/effects.dag", name: "filter", standing: Retired { cause: NotAReference } },
-  UnimportedBareProviderDisposition { file: "dag/std/evaluation_budget.dag", name: "Optional", standing: ActiveDebt },
+  UnimportedBareProviderDisposition { file: "dag/std/evaluation_budget.dag", name: "Optional", standing: Retired { cause: ImportsFixed } },
   UnimportedBareProviderDisposition { file: "dag/std/fabric_storage.dag", name: "length", standing: Retired { cause: BindsWithoutDeclaration } },
   UnimportedBareProviderDisposition { file: "dag/std/fermi.dag", name: "filter", standing: Retired { cause: BindsWithoutDeclaration } },
   UnimportedBareProviderDisposition { file: "dag/std/filesystem.dag", name: "Other", standing: ActiveDebt },
diff --git a/src/v2/workflow/locality_affinity.dag b/src/v2/workflow/locality_affinity.dag
index 326be4ddbf4..de63808adf5 100644
--- a/src/v2/workflow/locality_affinity.dag
+++ b/src/v2/workflow/locality_affinity.dag
@@ -5,7 +5,7 @@ import std.measure { ByteSize, byte_size, measure_add, measure_le }
 import std.types { Int, List }
 import std.content_hash { ContentHash, Fnv1a64 }
 import v2.std.algebra { any, length }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
diff --git a/src/v2/workflow/orchestration_bash_test.dag b/src/v2/workflow/orchestration_bash_test.dag
index 93c3f8a6ec1..4d7648a3ab6 100644
--- a/src/v2/workflow/orchestration_bash_test.dag
+++ b/src/v2/workflow/orchestration_bash_test.dag
@@ -34,7 +34,7 @@ import v2.extdeps.languages.bash_orch_tier2 {
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/workflow/orchestration_emit_test.dag b/src/v2/workflow/orchestration_emit_test.dag
index b350bd255eb..1363c3eb7d4 100644
--- a/src/v2/workflow/orchestration_emit_test.dag
+++ b/src/v2/workflow/orchestration_emit_test.dag
@@ -16,7 +16,7 @@ import v2.std.orchestration {
   Predicate,
   ExitZero
 }
-import v2.std.optional { Optional, Present }
+import std.optional { Optional, Present }
 import v2.std.collection { Absent }
 import v2.std.diagnostic { Accepted, None, Outcome, Rejected }
 import v2.std.live_tree { LiveTreeDisposition, SubstrateInputsOnly }
diff --git a/src/v2/workflow/orchestration_retry_emit_test.dag b/src/v2/workflow/orchestration_retry_emit_test.dag
index 4b1579ae13f..9e00e467a24 100644
--- a/src/v2/workflow/orchestration_retry_emit_test.dag
+++ b/src/v2/workflow/orchestration_retry_emit_test.dag
@@ -39,7 +39,7 @@ import v2.std.algebra { list_head, HeadFound, HeadAbsent }
 import v2.std.collection {
   Map
 }
-import v2.std.optional {
+import std.optional {
   Optional,
   Present,
   Absent,
diff --git a/src/v2/workflow/product_receipt_stage.dag b/src/v2/workflow/product_receipt_stage.dag
index 0d4ba5f776b..78e809bb8a9 100644
--- a/src/v2/workflow/product_receipt_stage.dag
+++ b/src/v2/workflow/product_receipt_stage.dag
@@ -39,7 +39,7 @@ import v2.extdeps.languages.rust { rust_target_model }
 import v2.std.algebra { Empty, fold_list, length }
 import std.process { ExitSuccess, ProcessExit, exit_failure }
 import v2.std.node { Symbol, symbol_lexeme }
-import v2.std.optional { Absent, Present }
+import std.optional { Absent, Present }
 import v2.std.diagnostic { Accepted, Diagnostic, NonEmptyDiagnostics, Rejected, diagnostics_fatal_reason }
 import v2.workflow.body_lowering_retention_census {
   EvidenceNotApplicable,
diff --git a/src/v2/workflow/realization_attempt.dag b/src/v2/workflow/realization_attempt.dag
index 9bf5be03446..b0c0be62455 100644
--- a/src/v2/workflow/realization_attempt.dag
+++ b/src/v2/workflow/realization_attempt.dag
@@ -15,7 +15,7 @@ import extdeps.filesystem.filesystem_io { Filesystem }
 import extdeps.communication.medium { Medium }
 import v2.std.diagnostic { Accepted, Rejected, Outcome, DeclarationLocus, Diagnostic, InvariantPortLocus, NodeLocus, NonEmptyDiagnostics, SourcePortLocus, Textual, diagnostics_fatal, diagnostics_fatal_reason }
 import v2.std.node { Node, Edge, TypeNode, Arrow, Conj, Authored, StructuralLabel, Positional, Symbol, node_synthetic, symbol_lexeme }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.algebra { fold_list, length }
 import std.algebra { Cons, Empty }
 import std.types { Int, List, NonEmptyStr, String }
diff --git a/src/v2/workflow/realization_sweep.dag b/src/v2/workflow/realization_sweep.dag
index 3824ecb2c8b..1df3540b6c9 100644
--- a/src/v2/workflow/realization_sweep.dag
+++ b/src/v2/workflow/realization_sweep.dag
@@ -28,7 +28,7 @@ import v2.compiler.source_authority_read {
   source_root_ingest_build_from_source_refs
 }
 import v2.std.integer { integer_int_to_decimal_string }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.algebra { fold_list, length }
 import v2.std.collection { list_at_optional }
 import std.types { Int, List, String }
diff --git a/src/v2/workflow/required_floor.dag b/src/v2/workflow/required_floor.dag
index 0b4b54c7118..c9618d7d20c 100644
--- a/src/v2/workflow/required_floor.dag
+++ b/src/v2/workflow/required_floor.dag
@@ -2,7 +2,7 @@ module v2.workflow.required_floor
 
 import v2.std.algebra { Cons, Empty, contains, any, list_reverse }
 import gunbc.explicit_witness_admission { explicit_witness_admissions, explicit_witness_admission_is_known_red }
-import v2.std.optional { Optional, Present, Absent }
+import std.optional { Optional, Present, Absent }
 import v2.std.integer { Int, int_gt, int_add, int_mul }
 import v2.workflow.floor_expected_red { floor_expected_red_roster }
 import v2.workflow.floor_non_verdict { floor_non_verdict_roster }
diff --git a/src/v2/workflow/rust_crate_partition.dag b/src/v2/workflow/rust_crate_partition.dag
index ded72fcf56a..ce1c8b2a30a 100644
--- a/src/v2/workflow/rust_crate_partition.dag
+++ b/src/v2/workflow/rust_crate_partition.dag
@@ -27,7 +27,7 @@ import v2.std.collection {
   map_get,
   map_insert
 }
-import v2.std.optional {
+import std.optional {
   Absent,
   Optional,
   Present,
@@ -318,6 +318,7 @@ fn stage0_std_primitive_modules() -> List<String> {
 fn stage0_std_core_modules() -> List<String> {
   stage0_std_primitive_modules()
     |> concat([
+      "std_optional",
       "std_algebra",
       "std_nat",
       "std_node",