GROOVY-6427: prefactoring