Build the no-shortcut keymap from the shortcut hash.
Fix with-keys macros
Some More robust tests
No need to remove items from no-shortcut map