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.
Good catch, thanks!