A better resolution to a possible circular dependency.