diff --git a/src/kern/riscv64/impl.zig b/src/kern/riscv64/impl.zig
index 872451f..e390d8b 100644
--- a/src/kern/riscv64/impl.zig
+++ b/src/kern/riscv64/impl.zig
@@ -14,7 +14,7 @@ pub const tlb_max_pages = 32;
 pub const ThreadContext = extern struct {
     sp: usize,
     ra: usize = 0,
-    s: [12]usize = .{0} ** 12,
+    s: [12]usize = @splat(0),
 
     pub fn init_with_stack(stack: r.VAddr) @This() {
         return .{ .sp = stack };
@@ -23,7 +23,7 @@ pub const ThreadContext = extern struct {
     pub fn reset(self: *@This(), stack_top: r.VAddr, entry: *const fn (?*anyopaque) void, arg: ?*anyopaque) @This() {
         self.sp = stack_top & ~@as(usize, 15);
         self.ra = @intFromPtr(&thread_start);
-        self.s = .{0} ** 12;
+        self.s = @splat(0);
         self.s[1] = @intFromPtr(entry);
         self.s[2] = @intFromPtr(arg);
         return self.*;
diff --git a/src/tests/smr.zig b/src/tests/smr.zig
index 3b00eac..cf650d8 100644
--- a/src/tests/smr.zig
+++ b/src/tests/smr.zig
@@ -18,7 +18,7 @@ const Object = struct {
 var dom: *ke.smr.Domain = undefined;
 var zone: mm.zone.Zone = undefined;
 
-var slots = [_]std.atomic.Value(?*Object){.init(null)} ** nslots;
+var slots: [nslots]std.atomic.Value(?*Object) = @splat(.init(null));
 
 var next_val = std.atomic.Value(u64).init(1);
 var reads = std.atomic.Value(u64).init(0);
diff --git a/src/tests/smr_pi.zig b/src/tests/smr_pi.zig
index 1d94f00..b1a0606 100644
--- a/src/tests/smr_pi.zig
+++ b/src/tests/smr_pi.zig
@@ -28,7 +28,7 @@ const Object = struct {
 var dom: *ke.smr.Domain = undefined;
 var zone: mm.zone.Zone = undefined;
 
-var slots = [_]std.atomic.Value(?*Object){.init(null)} ** nslots;
+var slots: [nslots]std.atomic.Value(?*Object) = @splat(.init(null));
 
 var next_val = std.atomic.Value(u64).init(1);
 var reads = std.atomic.Value(u64).init(0);