Fix a few items from third_party code review.

Dave pointed out a few problems to remedy.
Merge pull request #36 from arbeitspferde/code-review/dave-comments

Fix a few items from third_party code review.