GROOVY-6894: clean up generated code when using @TupleConstructor with @CompileStatic