Handle split hunks better, including saving the original hunk they were split from.