Finally fix random ClassCircularityError (for real this time. hopefully).