Refactoring of the Vi keybindings for better key composition.