Minor clean-ups for pull-review.