Move evil-emacs-state-modes additions to setup-evil.