diff --git a/metropolis/node/core/curator/impl_leader_test.go b/metropolis/node/core/curator/impl_leader_test.go
index 2951191..94fcd0c 100644
--- a/metropolis/node/core/curator/impl_leader_test.go
+++ b/metropolis/node/core/curator/impl_leader_test.go
@@ -1331,12 +1331,11 @@
 	}
 
 	// Give second node some roles.
-	yes := true
 	_, err = mgmt.UpdateNodeRoles(ctx, &apb.UpdateNodeRolesRequest{
 		Node: &apb.UpdateNodeRolesRequest_Id{
 			Id: tn[1].ID(),
 		},
-		KubernetesWorker: &yes,
+		KubernetesWorker: ptr.To(true),
 	})
 	if err != nil {
 		t.Fatalf("Adding node 1 a role failed: %v", err)
@@ -1427,12 +1426,11 @@
 	defer ctxC()
 
 	mgmt := apb.NewManagementClient(cl.mgmtConn)
-	true_ := true
 	_, err := mgmt.UpdateNodeRoles(ctx, &apb.UpdateNodeRolesRequest{
 		Node: &apb.UpdateNodeRolesRequest_Id{
 			Id: cl.localNodeID,
 		},
-		KubernetesWorker: &true_,
+		KubernetesWorker: ptr.To(true),
 	})
 	if err != nil {
 		t.Fatalf("Could not make node into Kubernetes worker: %v", err)
diff --git a/metropolis/node/kubernetes/reconciler/resources_csi.go b/metropolis/node/kubernetes/reconciler/resources_csi.go
index a1ca29f..2754528 100644
--- a/metropolis/node/kubernetes/reconciler/resources_csi.go
+++ b/metropolis/node/kubernetes/reconciler/resources_csi.go
@@ -63,7 +63,6 @@
 }
 
 func (r resourceCSIDrivers) Expected() []meta.Object {
-	fsGroupPolicy := storage.FileFSGroupPolicy
 	return []meta.Object{
 		&storage.CSIDriver{
 			ObjectMeta: meta.ObjectMeta{
@@ -75,7 +74,7 @@
 				PodInfoOnMount:       ptr.To(false),
 				VolumeLifecycleModes: []storage.VolumeLifecycleMode{storage.VolumeLifecyclePersistent},
 				StorageCapacity:      ptr.To(false),
-				FSGroupPolicy:        &fsGroupPolicy,
+				FSGroupPolicy:        ptr.To(storage.FileFSGroupPolicy),
 				RequiresRepublish:    ptr.To(false),
 				SELinuxMount:         ptr.To(false),
 			},
diff --git a/metropolis/node/kubernetes/reconciler/resources_storageclass.go b/metropolis/node/kubernetes/reconciler/resources_storageclass.go
index b3afc13..6b4ec73 100644
--- a/metropolis/node/kubernetes/reconciler/resources_storageclass.go
+++ b/metropolis/node/kubernetes/reconciler/resources_storageclass.go
@@ -26,9 +26,6 @@
 	"k8s.io/utils/ptr"
 )
 
-var reclaimPolicyDelete = core.PersistentVolumeReclaimDelete
-var waitForConsumerBinding = storage.VolumeBindingWaitForFirstConsumer
-
 type resourceStorageClasses struct {
 	kubernetes.Interface
 }
@@ -74,8 +71,8 @@
 			},
 			AllowVolumeExpansion: ptr.To(true),
 			Provisioner:          csiProvisionerName,
-			ReclaimPolicy:        &reclaimPolicyDelete,
-			VolumeBindingMode:    &waitForConsumerBinding,
+			ReclaimPolicy:        ptr.To(core.PersistentVolumeReclaimDelete),
+			VolumeBindingMode:    ptr.To(storage.VolumeBindingWaitForFirstConsumer),
 			MountOptions: []string{
 				"exec",
 				"dev",