Miscellaneous cleanup

@jdimond - please review and merge.

Hat-tip to @mikepugh for the inspiration for both of these items. I especially like the `catch()` addition to the test suite, Mike!