cleanup: prefer top-level rescue clauses