Updates from using in-practice

This is just a bunch of practical usage improvements.  The commits tell the story.  Basically, I assumed a lot in the orig prototype and those assumptions were wrong in some cases.  This addresses those, while keeping loc about the same.

@jcredding ready for review.