Minor tweaks for recent Vim