Final pass of cleanup: Get rid of gotos and general polish.

NB: This changes the outputs, in particular in error conditions,

in various subtle ways to be more systematic and usable.