Fix a few items from third_party code review.

Dave pointed out a few problems to remedy.