Clean up
Adapt to Vim 7.3.x