Changed CPolyManager slightly to be robust to static initialization order