More Groovy-ization