I merged in the change proposed in GROOVY-7647. The bytecode looks good to me but shout if you spot any anomalies.I wonder if now that change is in place whether we can unwind the NOP/ATHROW bytecodes. I'll try that out after Java2Days.
Cheers, Paul.