diff --git a/stage0/astgen_test.zig b/stage0/astgen_test.zig
index e0f8ab3c99..282f4f2102 100644
--- a/stage0/astgen_test.zig
+++ b/stage0/astgen_test.zig
@@ -1186,129 +1186,129 @@ fn expectEqualData(
 }
 
 const corpus_files = .{
-    .{ "astgen_test.zig", @embedFile("astgen_test.zig") },
-    .{ "build.zig", @embedFile("../build.zig") },
-    .{ "parser_test.zig", @embedFile("parser_test.zig") },
-    .{ "test_all.zig", @embedFile("test_all.zig") },
-    .{ "tokenizer_test.zig", @embedFile("tokenizer_test.zig") },
+    "astgen_test.zig",
+    "../build.zig",
+    "parser_test.zig",
+    "test_all.zig",
+    "tokenizer_test.zig",
 
-    .{ "optional.zig", @embedFile("../test/behavior/optional.zig") },
-    .{ "call.zig", @embedFile("../test/behavior/call.zig") },
-    .{ "pointers.zig", @embedFile("../test/behavior/pointers.zig") },
-    .{ "type.zig", @embedFile("../test/behavior/type.zig") },
-    .{ "enum.zig", @embedFile("../test/behavior/enum.zig") },
-    .{ "switch_on_captured_error.zig", @embedFile("../test/behavior/switch_on_captured_error.zig") },
-    .{ "error.zig", @embedFile("../test/behavior/error.zig") },
-    .{ "switch.zig", @embedFile("../test/behavior/switch.zig") },
-    .{ "array.zig", @embedFile("../test/behavior/array.zig") },
-    .{ "slice.zig", @embedFile("../test/behavior/slice.zig") },
-    .{ "basic.zig", @embedFile("../test/behavior/basic.zig") },
-    .{ "packed-struct.zig", @embedFile("../test/behavior/packed-struct.zig") },
-    .{ "eval.zig", @embedFile("../test/behavior/eval.zig") },
-    .{ "field_parent_ptr.zig", @embedFile("../test/behavior/field_parent_ptr.zig") },
-    .{ "struct.zig", @embedFile("../test/behavior/struct.zig") },
-    .{ "floatop.zig", @embedFile("../test/behavior/floatop.zig") },
-    .{ "union.zig", @embedFile("../test/behavior/union.zig") },
-    .{ "math.zig", @embedFile("../test/behavior/math.zig") },
-    .{ "vector.zig", @embedFile("../test/behavior/vector.zig") },
-    .{ "cast.zig", @embedFile("../test/behavior/cast.zig") },
-    .{ "abs.zig", @embedFile("../test/behavior/abs.zig") },
-    .{ "addrspace_and_linksection.zig", @embedFile("../test/behavior/addrspace_and_linksection.zig") },
-    .{ "align.zig", @embedFile("../test/behavior/align.zig") },
-    .{ "alignof.zig", @embedFile("../test/behavior/alignof.zig") },
-    .{ "asm.zig", @embedFile("../test/behavior/asm.zig") },
-    .{ "atomics.zig", @embedFile("../test/behavior/atomics.zig") },
-    .{ "bitcast.zig", @embedFile("../test/behavior/bitcast.zig") },
-    .{ "bitreverse.zig", @embedFile("../test/behavior/bitreverse.zig") },
-    .{ "bit_shifting.zig", @embedFile("../test/behavior/bit_shifting.zig") },
-    //.{ "bool.zig", @embedFile("../test/behavior/bool.zig") },
-    //.{ "builtin_functions_returning_void_or_noreturn.zig", @embedFile("../test/behavior/builtin_functions_returning_void_or_noreturn.zig") },
-    .{ "byteswap.zig", @embedFile("../test/behavior/byteswap.zig") },
-    .{ "byval_arg_var.zig", @embedFile("../test/behavior/byval_arg_var.zig") },
-    .{ "cast_int.zig", @embedFile("../test/behavior/cast_int.zig") },
-    .{ "comptime_memory.zig", @embedFile("../test/behavior/comptime_memory.zig") },
-    .{ "const_slice_child.zig", @embedFile("../test/behavior/const_slice_child.zig") },
-    .{ "decl_literals.zig", @embedFile("../test/behavior/decl_literals.zig") },
-    .{ "decltest.zig", @embedFile("../test/behavior/decltest.zig") },
-    //.{ "defer.zig", @embedFile("../test/behavior/defer.zig") },
-    //.{ "destructure.zig", @embedFile("../test/behavior/destructure.zig") },
-    .{ "duplicated_test_names.zig", @embedFile("../test/behavior/duplicated_test_names.zig") },
-    .{ "empty_union.zig", @embedFile("../test/behavior/empty_union.zig") },
-    .{ "export_builtin.zig", @embedFile("../test/behavior/export_builtin.zig") },
-    .{ "export_c_keywords.zig", @embedFile("../test/behavior/export_c_keywords.zig") },
-    //.{ "export_keyword.zig", @embedFile("../test/behavior/export_keyword.zig") },
-    .{ "export_self_referential_type_info.zig", @embedFile("../test/behavior/export_self_referential_type_info.zig") },
-    .{ "extern_struct_zero_size_fields.zig", @embedFile("../test/behavior/extern_struct_zero_size_fields.zig") },
-    //.{ "extern.zig", @embedFile("../test/behavior/extern.zig") },
-    .{ "fn_delegation.zig", @embedFile("../test/behavior/fn_delegation.zig") },
-    .{ "fn_in_struct_in_comptime.zig", @embedFile("../test/behavior/fn_in_struct_in_comptime.zig") },
-    //.{ "fn.zig", @embedFile("../test/behavior/fn.zig") },
-    .{ "for.zig", @embedFile("../test/behavior/for.zig") },
-    //.{ "generics.zig", @embedFile("../test/behavior/generics.zig") },
-    .{ "globals.zig", @embedFile("../test/behavior/globals.zig") },
-    .{ "hasdecl.zig", @embedFile("../test/behavior/hasdecl.zig") },
-    .{ "hasfield.zig", @embedFile("../test/behavior/hasfield.zig") },
-    .{ "if.zig", @embedFile("../test/behavior/if.zig") },
-    //.{ "import_c_keywords.zig", @embedFile("../test/behavior/import_c_keywords.zig") },
-    .{ "import.zig", @embedFile("../test/behavior/import.zig") },
-    .{ "incomplete_struct_param_tld.zig", @embedFile("../test/behavior/incomplete_struct_param_tld.zig") },
-    .{ "inline_switch.zig", @embedFile("../test/behavior/inline_switch.zig") },
-    .{ "int128.zig", @embedFile("../test/behavior/int128.zig") },
-    .{ "int_comparison_elision.zig", @embedFile("../test/behavior/int_comparison_elision.zig") },
-    .{ "ir_block_deps.zig", @embedFile("../test/behavior/ir_block_deps.zig") },
-    .{ "lower_strlit_to_vector.zig", @embedFile("../test/behavior/lower_strlit_to_vector.zig") },
-    //.{ "maximum_minimum.zig", @embedFile("../test/behavior/maximum_minimum.zig") },
-    .{ "member_func.zig", @embedFile("../test/behavior/member_func.zig") },
-    .{ "memcpy.zig", @embedFile("../test/behavior/memcpy.zig") },
-    .{ "memmove.zig", @embedFile("../test/behavior/memmove.zig") },
-    .{ "memset.zig", @embedFile("../test/behavior/memset.zig") },
-    .{ "merge_error_sets.zig", @embedFile("../test/behavior/merge_error_sets.zig") },
-    //.{ "muladd.zig", @embedFile("../test/behavior/muladd.zig") },
-    //.{ "multiple_externs_with_conflicting_types.zig", @embedFile("../test/behavior/multiple_externs_with_conflicting_types.zig") },
-    .{ "namespace_depends_on_compile_var.zig", @embedFile("../test/behavior/namespace_depends_on_compile_var.zig") },
-    .{ "nan.zig", @embedFile("../test/behavior/nan.zig") },
-    .{ "null.zig", @embedFile("../test/behavior/null.zig") },
-    .{ "packed_struct_explicit_backing_int.zig", @embedFile("../test/behavior/packed_struct_explicit_backing_int.zig") },
-    .{ "packed-union.zig", @embedFile("../test/behavior/packed-union.zig") },
-    .{ "popcount.zig", @embedFile("../test/behavior/popcount.zig") },
-    //.{ "prefetch.zig", @embedFile("../test/behavior/prefetch.zig") },
-    .{ "ptrcast.zig", @embedFile("../test/behavior/ptrcast.zig") },
-    .{ "ptrfromint.zig", @embedFile("../test/behavior/ptrfromint.zig") },
-    .{ "pub_enum.zig", @embedFile("../test/behavior/pub_enum.zig") },
-    .{ "reflection.zig", @embedFile("../test/behavior/reflection.zig") },
-    .{ "ref_var_in_if_after_if_2nd_switch_prong.zig", @embedFile("../test/behavior/ref_var_in_if_after_if_2nd_switch_prong.zig") },
-    //.{ "return_address.zig", @embedFile("../test/behavior/return_address.zig") },
-    .{ "saturating_arithmetic.zig", @embedFile("../test/behavior/saturating_arithmetic.zig") },
-    //.{ "select.zig", @embedFile("../test/behavior/select.zig") },
-    .{ "shuffle.zig", @embedFile("../test/behavior/shuffle.zig") },
-    //.{ "sizeof_and_typeof.zig", @embedFile("../test/behavior/sizeof_and_typeof.zig") },
-    .{ "slice_sentinel_comptime.zig", @embedFile("../test/behavior/slice_sentinel_comptime.zig") },
-    //.{ "src.zig", @embedFile("../test/behavior/src.zig") },
-    //.{ "string_literals.zig", @embedFile("../test/behavior/string_literals.zig") },
-    .{ "struct_contains_null_ptr_itself.zig", @embedFile("../test/behavior/struct_contains_null_ptr_itself.zig") },
-    .{ "struct_contains_slice_of_itself.zig", @embedFile("../test/behavior/struct_contains_slice_of_itself.zig") },
-    //.{ "switch_loop.zig", @embedFile("../test/behavior/switch_loop.zig") },
-    .{ "switch_prong_err_enum.zig", @embedFile("../test/behavior/switch_prong_err_enum.zig") },
-    .{ "switch_prong_implicit_cast.zig", @embedFile("../test/behavior/switch_prong_implicit_cast.zig") },
-    .{ "this.zig", @embedFile("../test/behavior/this.zig") },
-    .{ "threadlocal.zig", @embedFile("../test/behavior/threadlocal.zig") },
-    .{ "truncate.zig", @embedFile("../test/behavior/truncate.zig") },
-    //.{ "try.zig", @embedFile("../test/behavior/try.zig") },
-    .{ "tuple_declarations.zig", @embedFile("../test/behavior/tuple_declarations.zig") },
-    .{ "tuple.zig", @embedFile("../test/behavior/tuple.zig") },
-    //.{ "type_info.zig", @embedFile("../test/behavior/type_info.zig") },
-    .{ "typename.zig", @embedFile("../test/behavior/typename.zig") },
-    .{ "undefined.zig", @embedFile("../test/behavior/undefined.zig") },
-    //.{ "underscore.zig", @embedFile("../test/behavior/underscore.zig") },
-    .{ "union_with_members.zig", @embedFile("../test/behavior/union_with_members.zig") },
-    //.{ "var_args.zig", @embedFile("../test/behavior/var_args.zig") },
-    .{ "void.zig", @embedFile("../test/behavior/void.zig") },
-    //.{ "wasm.zig", @embedFile("../test/behavior/wasm.zig") },
-    //.{ "while.zig", @embedFile("../test/behavior/while.zig") },
-    .{ "widening.zig", @embedFile("../test/behavior/widening.zig") },
-    .{ "wrapping_arithmetic.zig", @embedFile("../test/behavior/wrapping_arithmetic.zig") },
-    .{ "x86_64.zig", @embedFile("../test/behavior/x86_64.zig") },
-    //.{ "zon.zig", @embedFile("../test/behavior/zon.zig") },
+    "../test/behavior/optional.zig",
+    "../test/behavior/call.zig",
+    "../test/behavior/pointers.zig",
+    "../test/behavior/type.zig",
+    "../test/behavior/enum.zig",
+    "../test/behavior/switch_on_captured_error.zig",
+    "../test/behavior/error.zig",
+    "../test/behavior/switch.zig",
+    "../test/behavior/array.zig",
+    "../test/behavior/slice.zig",
+    "../test/behavior/basic.zig",
+    "../test/behavior/packed-struct.zig",
+    "../test/behavior/eval.zig",
+    "../test/behavior/field_parent_ptr.zig",
+    "../test/behavior/struct.zig",
+    "../test/behavior/floatop.zig",
+    "../test/behavior/union.zig",
+    "../test/behavior/math.zig",
+    "../test/behavior/vector.zig",
+    "../test/behavior/cast.zig",
+    "../test/behavior/abs.zig",
+    "../test/behavior/addrspace_and_linksection.zig",
+    "../test/behavior/align.zig",
+    "../test/behavior/alignof.zig",
+    "../test/behavior/asm.zig",
+    "../test/behavior/atomics.zig",
+    "../test/behavior/bitcast.zig",
+    "../test/behavior/bitreverse.zig",
+    "../test/behavior/bit_shifting.zig",
+    //"../test/behavior/bool.zig",
+    //"../test/behavior/builtin_functions_returning_void_or_noreturn.zig",
+    "../test/behavior/byteswap.zig",
+    "../test/behavior/byval_arg_var.zig",
+    "../test/behavior/cast_int.zig",
+    "../test/behavior/comptime_memory.zig",
+    "../test/behavior/const_slice_child.zig",
+    "../test/behavior/decl_literals.zig",
+    "../test/behavior/decltest.zig",
+    //"../test/behavior/defer.zig",
+    //"../test/behavior/destructure.zig",
+    "../test/behavior/duplicated_test_names.zig",
+    "../test/behavior/empty_union.zig",
+    "../test/behavior/export_builtin.zig",
+    "../test/behavior/export_c_keywords.zig",
+    //"../test/behavior/export_keyword.zig",
+    "../test/behavior/export_self_referential_type_info.zig",
+    "../test/behavior/extern_struct_zero_size_fields.zig",
+    //"../test/behavior/extern.zig",
+    "../test/behavior/fn_delegation.zig",
+    "../test/behavior/fn_in_struct_in_comptime.zig",
+    //"../test/behavior/fn.zig",
+    "../test/behavior/for.zig",
+    //"../test/behavior/generics.zig",
+    "../test/behavior/globals.zig",
+    "../test/behavior/hasdecl.zig",
+    "../test/behavior/hasfield.zig",
+    "../test/behavior/if.zig",
+    //"../test/behavior/import_c_keywords.zig",
+    "../test/behavior/import.zig",
+    "../test/behavior/incomplete_struct_param_tld.zig",
+    "../test/behavior/inline_switch.zig",
+    "../test/behavior/int128.zig",
+    "../test/behavior/int_comparison_elision.zig",
+    "../test/behavior/ir_block_deps.zig",
+    "../test/behavior/lower_strlit_to_vector.zig",
+    //"../test/behavior/maximum_minimum.zig",
+    "../test/behavior/member_func.zig",
+    "../test/behavior/memcpy.zig",
+    "../test/behavior/memmove.zig",
+    "../test/behavior/memset.zig",
+    "../test/behavior/merge_error_sets.zig",
+    //"../test/behavior/muladd.zig",
+    //"../test/behavior/multiple_externs_with_conflicting_types.zig",
+    "../test/behavior/namespace_depends_on_compile_var.zig",
+    "../test/behavior/nan.zig",
+    "../test/behavior/null.zig",
+    "../test/behavior/packed_struct_explicit_backing_int.zig",
+    "../test/behavior/packed-union.zig",
+    "../test/behavior/popcount.zig",
+    //"../test/behavior/prefetch.zig",
+    "../test/behavior/ptrcast.zig",
+    "../test/behavior/ptrfromint.zig",
+    "../test/behavior/pub_enum.zig",
+    "../test/behavior/reflection.zig",
+    "../test/behavior/ref_var_in_if_after_if_2nd_switch_prong.zig",
+    //"../test/behavior/return_address.zig",
+    "../test/behavior/saturating_arithmetic.zig",
+    //"../test/behavior/select.zig",
+    "../test/behavior/shuffle.zig",
+    //"../test/behavior/sizeof_and_typeof.zig",
+    "../test/behavior/slice_sentinel_comptime.zig",
+    //"../test/behavior/src.zig",
+    //"../test/behavior/string_literals.zig",
+    "../test/behavior/struct_contains_null_ptr_itself.zig",
+    "../test/behavior/struct_contains_slice_of_itself.zig",
+    //"../test/behavior/switch_loop.zig",
+    "../test/behavior/switch_prong_err_enum.zig",
+    "../test/behavior/switch_prong_implicit_cast.zig",
+    "../test/behavior/this.zig",
+    "../test/behavior/threadlocal.zig",
+    "../test/behavior/truncate.zig",
+    //"../test/behavior/try.zig",
+    "../test/behavior/tuple_declarations.zig",
+    "../test/behavior/tuple.zig",
+    //"../test/behavior/type_info.zig",
+    "../test/behavior/typename.zig",
+    "../test/behavior/undefined.zig",
+    //"../test/behavior/underscore.zig",
+    "../test/behavior/union_with_members.zig",
+    //"../test/behavior/var_args.zig",
+    "../test/behavior/void.zig",
+    //"../test/behavior/wasm.zig",
+    //"../test/behavior/while.zig",
+    "../test/behavior/widening.zig",
+    "../test/behavior/wrapping_arithmetic.zig",
+    "../test/behavior/x86_64.zig",
+    //"../test/behavior/zon.zig",
 };
 
 fn corpusCheck(gpa: Allocator, source: [:0]const u8) !void {
@@ -1666,10 +1666,10 @@ test "astgen: corpus" {
     const gpa = std.testing.allocator;
 
     var any_fail = false;
-    inline for (corpus_files) |entry| {
-        // std.debug.print("--- {s} ---\n", .{entry[0]});
-        corpusCheck(gpa, entry[1]) catch {
-            std.debug.print("FAIL: {s}\n", .{entry[0]});
+    inline for (corpus_files) |path| {
+        // std.debug.print("--- {s} ---\n", .{path});
+        corpusCheck(gpa, @embedFile(path)) catch {
+            std.debug.print("FAIL: {s}\n", .{path});
             any_fail = true;
         };
     }