diff --git a/lib/std/debug.zig b/lib/std/debug.zig
index 35c13809f735741d0f456fa9560e3f0f194ffba4..11d808a17d50f204a84187a431433c645fb82011 100644
--- a/lib/std/debug.zig
+++ b/lib/std/debug.zig
@@ -1254,7 +1254,7 @@ pub const DebugInfo = struct {
                     if (context.address >= seg_start and context.address < seg_end) {
                         // Android libc uses NULL instead of an empty string to mark the
                         // main program
-                        context.name = if (info.dlpi_name) |dlpi_name| mem.spanZ(dlpi_name) else "";
+                        context.name = mem.spanZ(info.dlpi_name) orelse "";
                         context.base_address = info.dlpi_addr;
                         // Stop the iteration
                         return error.Found;
diff --git a/lib/std/os.zig b/lib/std/os.zig
index e9e3b449f22c9a454bf2b56be072918a8933a377..48d82797bd39a813e05494e73f48a164fd97577d 100644
--- a/lib/std/os.zig
+++ b/lib/std/os.zig
@@ -1078,7 +1078,7 @@ pub fn execvpe_expandArg0(
     mem.set(?[*:0]u8, argv_buf, null);
     defer {
         for (argv_buf) |arg| {
-            const arg_buf = if (arg) |ptr| mem.spanZ(ptr) else break;
+            const arg_buf = mem.spanZ(arg) orelse break;
             allocator.free(arg_buf);
         }
         allocator.free(argv_buf);
diff --git a/src-self-hosted/stage2.zig b/src-self-hosted/stage2.zig
index fcf9634097b757291ad20d2ed284ffa03fc8e6fb..d9b763912c0044bdfaeffb784e7fac5b4e05337d 100644
--- a/src-self-hosted/stage2.zig
+++ b/src-self-hosted/stage2.zig
@@ -689,12 +689,11 @@ fn stage2CrossTarget(
     mcpu_oz: ?[*:0]const u8,
     dynamic_linker_oz: ?[*:0]const u8,
 ) !CrossTarget {
-    const zig_triple = if (zig_triple_oz) |zig_triple_z| mem.spanZ(zig_triple_z) else "native";
-    const mcpu = if (mcpu_oz) |mcpu_z| mem.spanZ(mcpu_z) else null;
-    const dynamic_linker = if (dynamic_linker_oz) |dl_z| mem.spanZ(dl_z) else null;
+    const mcpu = mem.spanZ(mcpu_oz);
+    const dynamic_linker = mem.spanZ(dynamic_linker_oz);
     var diags: CrossTarget.ParseOptions.Diagnostics = .{};
     const target: CrossTarget = CrossTarget.parse(.{
-        .arch_os_abi = zig_triple,
+        .arch_os_abi = mem.spanZ(zig_triple_oz) orelse "native",
         .cpu_features = mcpu,
         .dynamic_linker = dynamic_linker,
         .diagnostics = &diags,