Re-order keys
Fix bug so that globally defined discover keys do not conflict with
local ones in `makey-key-mode'.