More keymap stuff, getting ready to rewrite define/lookup-key