[PATCH 6/6] Vim: Cleanup