Updating Groovy macros to use 2.3.3 from 1.8.8.