vim: cleanup a few minor glitches