Changes for better Groovy support in vim.