evil: Use fset instead of defalias

This makes the swapover much cleaner.