This PR polishes trivial stuff from bc71cc1a765ab33b0c70487959cc1976fedde0c2.

Comment From: sbrannen

This has been merged into master.

Thanks