Some fixups in response to reviews.

Includes a bit of reworking exception routing.

Assisted-by: Codex:GPT-5

Signed-off-by: Jesse F. Williamson <jfw@ibm.com>