Fix a small set of colliding things, and ordering.
more cleanup of vim modules