Remove catch-all exception handlers.
Tighten up classes in exception clauses.