Refactor interactive types (again)
Fix evil-repeat-motion bug