Improve Vim's completion