More avoidance of circular deps