Restore structure to targets lost during nonrecursive refactor.