diff --git a/src/base/base_arena.h b/src/base/base_arena.h
index cc97c84b..78378fcc 100644
--- a/src/base/base_arena.h
+++ b/src/base/base_arena.h
@@ -67,10 +67,9 @@ TempArena BeginScratch(Arena *potential_conflict);
 TempArena BeginScratchNoConflict_(void);
 void EndScratch(TempArena scratch_temp);
 
-// This macro declares an unused "arena" variable that will produce a shadowing
-// warning variable is present (due to shadowing). This is for catching obvious
-// cases of `BeginScratchNoConflict` getting called when an `arena` variable
-// already exists in the caller's scope.
+// This macro declares an unused "arena" variable in order to produce a shadowing
+// warning. This is for catching obvious cases of `BeginScratchNoConflict`
+// getting called when an `arena` variable already exists in the caller's scope.
 #define BeginScratchNoConflict() \
   BeginScratchNoConflict_();     \
   do {                           \
diff --git a/src/gpu/gpu_common.c b/src/gpu/gpu_common.c
index 025d48aa..68c91511 100644
--- a/src/gpu/gpu_common.c
+++ b/src/gpu/gpu_common.c
@@ -55,72 +55,52 @@ void G_BootstrapCommon(void)
     }
 
     // Init basic samplers
-    for (G_BasicSamplerKind sampler_kind = 0; sampler_kind < countof(G.basic_samplers); ++sampler_kind)
     {
-      G_SamplerRef sampler = Zi;
-      switch (sampler_kind)
       {
-        default:
-        {
-          // Sampler unspecified
-          Assert(0);
-        } FALLTHROUGH;
-        case G_BasicSamplerKind_PointClamp:
-        {
-          G_Filter filter              = G_Filter_MinMagMipPoint;
-          G_AddressMode address_mode   = G_AddressMode_Clamp;
-          sampler                      = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
-        } break;
-        case G_BasicSamplerKind_PointWrap:
-        {
-          G_Filter filter              = G_Filter_MinMagMipPoint;
-          G_AddressMode address_mode   = G_AddressMode_Wrap;
-          sampler                      = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
-        } break;
-        case G_BasicSamplerKind_PointMirror:
-        {
-          G_Filter filter              = G_Filter_MinMagMipPoint;
-          G_AddressMode address_mode   = G_AddressMode_Mirror;
-          sampler                      = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
-        } break;
-        case G_BasicSamplerKind_BilinearClamp:
-        {
-          G_Filter filter              = G_Filter_MinMagLinearMipPoint;
-          G_AddressMode address_mode   = G_AddressMode_Clamp;
-          sampler                      = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
-        } break;
-        case G_BasicSamplerKind_BilinearWrap:
-        {
-          G_Filter filter              = G_Filter_MinMagLinearMipPoint;
-          G_AddressMode address_mode   = G_AddressMode_Wrap;
-          sampler                      = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
-        } break;
-        case G_BasicSamplerKind_BilinearMirror:
-        {
-          G_Filter filter              = G_Filter_MinMagLinearMipPoint;
-          G_AddressMode address_mode   = G_AddressMode_Mirror;
-          sampler                      = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
-        } break;
-        case G_BasicSamplerKind_TrilinearClamp:
-        {
-          G_Filter filter              = G_Filter_MinMagMipLinear;
-          G_AddressMode address_mode   = G_AddressMode_Clamp;
-          sampler                      = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
-        } break;
-        case G_BasicSamplerKind_TrilinearWrap:
-        {
-          G_Filter filter              = G_Filter_MinMagMipLinear;
-          G_AddressMode address_mode   = G_AddressMode_Wrap;
-          sampler                      = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
-        } break;
-        case G_BasicSamplerKind_TrilinearMirror:
-        {
-          G_Filter filter              = G_Filter_MinMagMipLinear;
-          G_AddressMode address_mode   = G_AddressMode_Mirror;
-          sampler                      = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
-        } break;
+        G_Filter filter              = G_Filter_MinMagMipPoint;
+        G_AddressMode address_mode   = G_AddressMode_Clamp;
+        G.basic_samplers[G_BasicSamplerKind_PointClamp]       = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
+      }
+      {
+        G_Filter filter              = G_Filter_MinMagMipPoint;
+        G_AddressMode address_mode   = G_AddressMode_Wrap;
+        G.basic_samplers[G_BasicSamplerKind_PointWrap]        = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
+      }
+      {
+        G_Filter filter              = G_Filter_MinMagMipPoint;
+        G_AddressMode address_mode   = G_AddressMode_Mirror;
+        G.basic_samplers[G_BasicSamplerKind_PointMirror]      = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
+      }
+      {
+        G_Filter filter              = G_Filter_MinMagLinearMipPoint;
+        G_AddressMode address_mode   = G_AddressMode_Clamp;
+        G.basic_samplers[G_BasicSamplerKind_BilinearClamp]    = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
+      }
+      {
+        G_Filter filter              = G_Filter_MinMagLinearMipPoint;
+        G_AddressMode address_mode   = G_AddressMode_Wrap;
+        G.basic_samplers[G_BasicSamplerKind_BilinearWrap]     = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
+      }
+      {
+        G_Filter filter              = G_Filter_MinMagLinearMipPoint;
+        G_AddressMode address_mode   = G_AddressMode_Mirror;
+        G.basic_samplers[G_BasicSamplerKind_BilinearMirror]   = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
+      }
+      {
+        G_Filter filter              = G_Filter_MinMagMipLinear;
+        G_AddressMode address_mode   = G_AddressMode_Clamp;
+        G.basic_samplers[G_BasicSamplerKind_TrilinearClamp]   = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
+      }
+      {
+        G_Filter filter              = G_Filter_MinMagMipLinear;
+        G_AddressMode address_mode   = G_AddressMode_Wrap;
+        G.basic_samplers[G_BasicSamplerKind_TrilinearWrap]    = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
+      }
+      {
+        G_Filter filter              = G_Filter_MinMagMipLinear;
+        G_AddressMode address_mode   = G_AddressMode_Mirror;
+        G.basic_samplers[G_BasicSamplerKind_TrilinearMirror]  = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
       }
-      G.basic_samplers[sampler_kind] = sampler;
     }
   }
   G_CommitCommandList(cl);
diff --git a/src/pp/pp_vis/pp_vis_core.c b/src/pp/pp_vis/pp_vis_core.c
index 96b6d9d0..6d4a4090 100644
--- a/src/pp/pp_vis/pp_vis_core.c
+++ b/src/pp/pp_vis/pp_vis_core.c
@@ -1789,7 +1789,7 @@ void V_TickForever(WaveLaneCtx *lane)
       frame->local_world->seed = predict_world->seed;
       P_ClearFrames(frame->local_world, I64Min, I64Max);
 
-      if (TweakBool("Interpolation enabled", 0))
+      if (TweakBool("Interpolation enabled", 1))
       {
         // Locate sim keyframes
         P_Frame *left_sim_frame = &P_NilFrame;