GROOVY-6893: clean up generated code when using @EqualsAndHashCode with @CompileStatic