In each case where we set the client as "unkillable by stepdown," we do it right after creating the client. We can also never un-set the "unkillability." As such, we can place it on construction, assume it's const, and check it without ever taking the client lock.