More keybinding cleanups.