Also fixes #643, which is caused because evil is disabled and these fixes clumsily use evil-define-key* (which won't exist).