moving to Groovy 2.3.7 exposed more static issues and compilation issues