Further work on vim mode.
All vim parsing now appears to work.  Hurray.