Fix up orphan removals so they actually work.
Merge pull request #651 from doctrine/fix/orphan-removals

Fix up orphan removals so they actually work.