Three miscellaneous improvements for Vim

I was not aware of #15429; it is amusing that we got to it at about the same time—it is something I have been meaning to do for many weeks.

When other things are confirmed, I’ll update this to drop the variable declaration part. (Personally I would still prefer it thus, but not strongly.)