[vim] Fixups for empty lines and whitespace operator-motion