Switched to Jeremy Rayner's groovy-mode implementation