[wip] Beefed up Vim a bit.