fixup! keymap: abstract a bit over the keymap format