That's what I get (here and below) for trying to work outside my usual Vim setup :P. Fixing all now.