[emacs/evil] touch up my mode state mappings