keybindings: A bit more cleanup