[vim] Further indentation improvements.