fix some more of the corner cases with vim replacement.