Make the last patch more future-proof.