Fix warnings from calls to catch_errors() and make_cleanup().