Better safeguards to protect against double-keymap modifications