Fix merge-split spill issues.