standardize to modern 'except FooError as err:' syntax (Part 2)