Cleanups: more consistent code.  No semantic changes.
Merge pull request #66 from cgay/dev

Cleanups: more consistent code.  No semantic changes.