Catkinized, updated for Groovy.