Three miscellaneous improvements for Vim

I forgot to do this part in #15429, so it should be added unconditionally.