Hotkeys cleanup, remove many of the inline definitions and more keysym help on osx.