More recent changes post Bristol.
I got interrupted in the middle - need to walk through the latest line byline.
A lot of the noexcept work is good though.