GROOVY-6913: additional cleanup for @Immutable combined with @CompileStatic