Groovy, Statics, Fixes

Further work towards the static-core ...