GROOVY-6917: additional cleanup for @Category combined with @CompileStatic