One more thing in the target-resolution refactor.