Clean up handling of shortcut keys.