Fix coding style

Implements various features for the "old" Vi Mode.

Based on feedback, code reformats were squashed into each commit.