[Vim] More annoyance fixes.