GROOVY-6819: further AIC fixes