GROOVY-6855: Groovy annotations that support closures don't get stubs generated correctly (fix too eager commit)