Yes, it is a cut-n-paste error. Note sure yet how to remove the duplication, maybe this is where some variation on the removed DependencyTracker class would come back in?