Updated for compatibility with Vim 7.4