Cleanup error reporting code, minor nits

I gave in into my OCD a bit, tried to use `thiserror` but that seems like not a good fit, so instead made error enum a bit more readable and far shorter.  Also, a few tiny nits with trailing commas.