Assorted cleanups.
More cleanups.
Merge pull request #218 from dstegelman/feature/cleanups

Assorted cleanups.