Fix an issues with circular dependencies.

Circular dependencies should work, but did not.