Cleaner post-exception-check code. Lots of code work. All tested.