Collapse catch clauses where applicable