final minor stylistic cleanups, no real change.
Ref #592.