Beginning update to Groovy.