Fix circular dependencies.