Fix up orphan removals so they actually work.