Eliminate a number of style-guide violations.

Change-Id: Iedcd611e5c7ad24c84c004d8d6c551d1734e443c