Increase code coverage to 81.8%

Rest require something failing deep in a function or testing the main()
function directly.

I really wish there was a way to mark a block of Go code with a
no-cover pragma.