diff --git a/src-self-hosted/Module.zig b/src-self-hosted/Module.zig
index dd4e8fea1e..005f44a270 100644
--- a/src-self-hosted/Module.zig
+++ b/src-self-hosted/Module.zig
@@ -1256,8 +1256,8 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
             };
             defer fn_type_scope.instructions.deinit(self.gpa);
 
-            decl.is_pub = fn_proto.getTrailer("visib_token") != null;
-            const body_node = fn_proto.getTrailer("body_node") orelse
+            decl.is_pub = fn_proto.getTrailer(.visib_token) != null;
+            const body_node = fn_proto.getTrailer(.body_node) orelse
                 return self.failTok(&fn_type_scope.base, fn_proto.fn_token, "TODO implement extern functions", .{});
 
             const param_decls = fn_proto.params();
@@ -1276,19 +1276,19 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
                 };
                 param_types[i] = try astgen.expr(self, &fn_type_scope.base, type_type_rl, param_type_node);
             }
-            if (fn_proto.getTrailer("var_args_token")) |var_args_token| {
+            if (fn_proto.getTrailer(.var_args_token)) |var_args_token| {
                 return self.failTok(&fn_type_scope.base, var_args_token, "TODO implement var args", .{});
             }
-            if (fn_proto.getTrailer("lib_name")) |lib_name| {
+            if (fn_proto.getTrailer(.lib_name)) |lib_name| {
                 return self.failNode(&fn_type_scope.base, lib_name, "TODO implement function library name", .{});
             }
-            if (fn_proto.getTrailer("align_expr")) |align_expr| {
+            if (fn_proto.getTrailer(.align_expr)) |align_expr| {
                 return self.failNode(&fn_type_scope.base, align_expr, "TODO implement function align expression", .{});
             }
-            if (fn_proto.getTrailer("section_expr")) |sect_expr| {
+            if (fn_proto.getTrailer(.section_expr)) |sect_expr| {
                 return self.failNode(&fn_type_scope.base, sect_expr, "TODO implement function section expression", .{});
             }
-            if (fn_proto.getTrailer("callconv_expr")) |callconv_expr| {
+            if (fn_proto.getTrailer(.callconv_expr)) |callconv_expr| {
                 return self.failNode(
                     &fn_type_scope.base,
                     callconv_expr,
@@ -1430,10 +1430,10 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
                 self.bin_file.freeDecl(decl);
             }
 
-            if (fn_proto.getTrailer("extern_export_inline_token")) |maybe_export_token| {
+            if (fn_proto.getTrailer(.extern_export_inline_token)) |maybe_export_token| {
                 if (tree.token_ids[maybe_export_token] == .Keyword_export) {
                     const export_src = tree.token_locs[maybe_export_token].start;
-                    const name_loc = tree.token_locs[fn_proto.getTrailer("name_token").?];
+                    const name_loc = tree.token_locs[fn_proto.getTrailer(.name_token).?];
                     const name = tree.tokenSliceLoc(name_loc);
                     // The scope needs to have the decl in it.
                     try self.analyzeExport(&block_scope.base, export_src, name, decl);
@@ -1460,37 +1460,37 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
             };
             defer block_scope.instructions.deinit(self.gpa);
 
-            decl.is_pub = var_decl.getTrailer("visib_token") != null;
+            decl.is_pub = var_decl.getTrailer(.visib_token) != null;
             const is_extern = blk: {
-                const maybe_extern_token = var_decl.getTrailer("extern_export_token") orelse
+                const maybe_extern_token = var_decl.getTrailer(.extern_export_token) orelse
                     break :blk false;
                 if (tree.token_ids[maybe_extern_token] != .Keyword_extern) break :blk false;
-                if (var_decl.getTrailer("init_node")) |some| {
+                if (var_decl.getTrailer(.init_node)) |some| {
                     return self.failNode(&block_scope.base, some, "extern variables have no initializers", .{});
                 }
                 break :blk true;
             };
-            if (var_decl.getTrailer("lib_name")) |lib_name| {
+            if (var_decl.getTrailer(.lib_name)) |lib_name| {
                 assert(is_extern);
                 return self.failNode(&block_scope.base, lib_name, "TODO implement function library name", .{});
             }
             const is_mutable = tree.token_ids[var_decl.mut_token] == .Keyword_var;
-            const is_threadlocal = if (var_decl.getTrailer("thread_local_token")) |some| blk: {
+            const is_threadlocal = if (var_decl.getTrailer(.thread_local_token)) |some| blk: {
                 if (!is_mutable) {
                     return self.failTok(&block_scope.base, some, "threadlocal variable cannot be constant", .{});
                 }
                 break :blk true;
             } else false;
-            assert(var_decl.getTrailer("comptime_token") == null);
-            if (var_decl.getTrailer("align_node")) |align_expr| {
+            assert(var_decl.getTrailer(.comptime_token) == null);
+            if (var_decl.getTrailer(.align_node)) |align_expr| {
                 return self.failNode(&block_scope.base, align_expr, "TODO implement function align expression", .{});
             }
-            if (var_decl.getTrailer("section_node")) |sect_expr| {
+            if (var_decl.getTrailer(.section_node)) |sect_expr| {
                 return self.failNode(&block_scope.base, sect_expr, "TODO implement function section expression", .{});
             }
 
             const explicit_type = blk: {
-                const type_node = var_decl.getTrailer("type_node") orelse
+                const type_node = var_decl.getTrailer(.type_node) orelse
                     break :blk null;
 
                 // Temporary arena for the zir instructions.
@@ -1517,7 +1517,7 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
             };
 
             var var_type: Type = undefined;
-            const value: ?Value = if (var_decl.getTrailer("init_node")) |init_node| blk: {
+            const value: ?Value = if (var_decl.getTrailer(.init_node)) |init_node| blk: {
                 var gen_scope_arena = std.heap.ArenaAllocator.init(self.gpa);
                 defer gen_scope_arena.deinit();
                 var gen_scope: Scope.GenZIR = .{
@@ -1602,7 +1602,7 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
             decl.analysis = .complete;
             decl.generation = self.generation;
 
-            if (var_decl.getTrailer("extern_export_token")) |maybe_export_token| {
+            if (var_decl.getTrailer(.extern_export_token)) |maybe_export_token| {
                 if (tree.token_ids[maybe_export_token] == .Keyword_export) {
                     const export_src = tree.token_locs[maybe_export_token].start;
                     const name_loc = tree.token_locs[var_decl.name_token];
@@ -1768,7 +1768,7 @@ fn analyzeRootSrcFile(self: *Module, root_scope: *Scope.File) !void {
     for (decls) |src_decl, decl_i| {
         if (src_decl.cast(ast.Node.FnProto)) |fn_proto| {
             // We will create a Decl for it regardless of analysis status.
-            const name_tok = fn_proto.getTrailer("name_token") orelse {
+            const name_tok = fn_proto.getTrailer(.name_token) orelse {
                 @panic("TODO missing function name");
             };
 
@@ -1804,7 +1804,7 @@ fn analyzeRootSrcFile(self: *Module, root_scope: *Scope.File) !void {
             } else {
                 const new_decl = try self.createNewDecl(&root_scope.base, name, decl_i, name_hash, contents_hash);
                 root_scope.decls.appendAssumeCapacity(new_decl);
-                if (fn_proto.getTrailer("extern_export_inline_token")) |maybe_export_token| {
+                if (fn_proto.getTrailer(.extern_export_inline_token)) |maybe_export_token| {
                     if (tree.token_ids[maybe_export_token] == .Keyword_export) {
                         self.work_queue.writeItemAssumeCapacity(.{ .analyze_decl = new_decl });
                     }
@@ -1831,7 +1831,7 @@ fn analyzeRootSrcFile(self: *Module, root_scope: *Scope.File) !void {
             } else {
                 const new_decl = try self.createNewDecl(&root_scope.base, name, decl_i, name_hash, contents_hash);
                 root_scope.decls.appendAssumeCapacity(new_decl);
-                if (var_decl.getTrailer("extern_export_token")) |maybe_export_token| {
+                if (var_decl.getTrailer(.extern_export_token)) |maybe_export_token| {
                     if (tree.token_ids[maybe_export_token] == .Keyword_export) {
                         self.work_queue.writeItemAssumeCapacity(.{ .analyze_decl = new_decl });
                     }
diff --git a/src-self-hosted/astgen.zig b/src-self-hosted/astgen.zig
index cb8191fcee..294a9be9c3 100644
--- a/src-self-hosted/astgen.zig
+++ b/src-self-hosted/astgen.zig
@@ -451,16 +451,16 @@ fn varDecl(
     block_arena: *Allocator,
 ) InnerError!*Scope {
     // TODO implement detection of shadowing
-    if (node.getTrailer("comptime_token")) |comptime_token| {
+    if (node.getTrailer(.comptime_token)) |comptime_token| {
         return mod.failTok(scope, comptime_token, "TODO implement comptime locals", .{});
     }
-    if (node.getTrailer("align_node")) |align_node| {
+    if (node.getTrailer(.align_node)) |align_node| {
         return mod.failNode(scope, align_node, "TODO implement alignment on locals", .{});
     }
     const tree = scope.tree();
     const name_src = tree.token_locs[node.name_token].start;
     const ident_name = try identifierTokenString(mod, scope, node.name_token);
-    const init_node = node.getTrailer("init_node") orelse
+    const init_node = node.getTrailer(.init_node) orelse
         return mod.fail(scope, name_src, "variables must be initialized", .{});
 
     switch (tree.token_ids[node.mut_token]) {
@@ -469,7 +469,7 @@ fn varDecl(
             // or an rvalue as a result location. If it is an rvalue, we can use the instruction as
             // the variable, no memory location needed.
             const result_loc = if (nodeMayNeedMemoryLocation(init_node)) r: {
-                if (node.getTrailer("type_node")) |type_node| {
+                if (node.getTrailer(.type_node)) |type_node| {
                     const type_inst = try typeExpr(mod, scope, type_node);
                     const alloc = try addZIRUnOp(mod, scope, name_src, .alloc, type_inst);
                     break :r ResultLoc{ .ptr = alloc };
@@ -478,7 +478,7 @@ fn varDecl(
                     break :r ResultLoc{ .inferred_ptr = alloc };
                 }
             } else r: {
-                if (node.getTrailer("type_node")) |type_node|
+                if (node.getTrailer(.type_node)) |type_node|
                     break :r ResultLoc{ .ty = try typeExpr(mod, scope, type_node) }
                 else
                     break :r .none;
@@ -494,7 +494,7 @@ fn varDecl(
             return &sub_scope.base;
         },
         .Keyword_var => {
-            const var_data: struct { result_loc: ResultLoc, alloc: *zir.Inst } = if (node.getTrailer("type_node")) |type_node| a: {
+            const var_data: struct { result_loc: ResultLoc, alloc: *zir.Inst } = if (node.getTrailer(.type_node)) |type_node| a: {
                 const type_inst = try typeExpr(mod, scope, type_node);
                 const alloc = try addZIRUnOp(mod, scope, name_src, .alloc, type_inst);
                 break :a .{ .alloc = alloc, .result_loc = .{ .ptr = alloc } };
diff --git a/src-self-hosted/translate_c.zig b/src-self-hosted/translate_c.zig
index 6628f5b99e..122415331e 100644
--- a/src-self-hosted/translate_c.zig
+++ b/src-self-hosted/translate_c.zig
@@ -675,7 +675,7 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {
     }
 
     const body_node = try block_scope.complete(rp.c);
-    proto_node.setTrailer("body_node", body_node);
+    proto_node.setTrailer(.body_node, body_node);
     return addTopLevelDecl(c, fn_name, &proto_node.base);
 }
 
@@ -4493,7 +4493,7 @@ fn transCreateNodeMacroFn(c: *Context, name: []const u8, ref: *ast.Node, proto_a
     const block_lbrace = try appendToken(c, .LBrace, "{");
 
     const return_kw = try appendToken(c, .Keyword_return, "return");
-    const unwrap_expr = try transCreateNodeUnwrapNull(c, ref.cast(ast.Node.VarDecl).?.getTrailer("init_node").?);
+    const unwrap_expr = try transCreateNodeUnwrapNull(c, ref.cast(ast.Node.VarDecl).?.getTrailer(.init_node).?);
 
     const call_expr = try c.createCall(unwrap_expr, fn_params.items.len);
     const call_params = call_expr.params();
@@ -6361,7 +6361,7 @@ fn getContainer(c: *Context, node: *ast.Node) ?*ast.Node {
             const ident = node.castTag(.Identifier).?;
             if (c.global_scope.sym_table.get(tokenSlice(c, ident.token))) |value| {
                 if (value.cast(ast.Node.VarDecl)) |var_decl|
-                    return getContainer(c, var_decl.getTrailer("init_node").?);
+                    return getContainer(c, var_decl.getTrailer(.init_node).?);
             }
         },
 
@@ -6390,7 +6390,7 @@ fn getContainerTypeOf(c: *Context, ref: *ast.Node) ?*ast.Node {
     if (ref.castTag(.Identifier)) |ident| {
         if (c.global_scope.sym_table.get(tokenSlice(c, ident.token))) |value| {
             if (value.cast(ast.Node.VarDecl)) |var_decl| {
-                if (var_decl.getTrailer("type_node")) |ty|
+                if (var_decl.getTrailer(.type_node)) |ty|
                     return getContainer(c, ty);
             }
         }
@@ -6412,7 +6412,7 @@ fn getContainerTypeOf(c: *Context, ref: *ast.Node) ?*ast.Node {
 }
 
 fn getFnProto(c: *Context, ref: *ast.Node) ?*ast.Node.FnProto {
-    const init = if (ref.cast(ast.Node.VarDecl)) |v| v.getTrailer("init_node").? else return null;
+    const init = if (ref.cast(ast.Node.VarDecl)) |v| v.getTrailer(.init_node).? else return null;
     if (getContainerTypeOf(c, init)) |ty_node| {
         if (ty_node.castTag(.OptionalType)) |prefix| {
             if (prefix.rhs.cast(ast.Node.FnProto)) |fn_proto| {