Idiomacy pass

@andymoe - continued cleanup, incorporating most comments from previous review.
 
If the class extension changes are acceptable, my intention is to apply this style uniformly to the rest of the code base.
Yeah, noticed that to - I made a note to circle back to it (was doing a largely mechanical conversion of the existing types, and didn't want to chase this through every code path, most of which I'm not familiar with)