fix generators after raise-from merge