Final preening of Python 3 exception handling