Incorporate changes from bbatsov pull request comments.