Remove silly circular references.
Remove more circular reference cruft.