Upgraded to current Groovy.