Vim improvements.