- Improved for vimfiler.