Dependency and target rewrite in progress.