GROOVY-2974: Minimal clean-up