Stabilize semantics of NonNilCheck autocorrect