Restructure targets so BundleNodes are given top priority.