Fixes for diff-hunk-kill.