Vim: Refactoring.
Vim: Fix some mappings.