Fix groovysh broken after refactor for GROOVY-6553