Convert remaining old style `catch' to `with-throw-handler'