Some more code style corrections of Keymap.