retract some of the _ changes, to make it work with our desugaring of try/except