Move leftover pieces of evil-mode setup.