EHCatchret
EHCont
catchret
This change splits out the renaming and comment updates from #129612 as a non-functional change.