Vim: continue clean up.