Import some minor cleanups from Google's copy.

Change-Id: Ib32933e9cd85d72da254cb4c53ffc5ea85497c7b
Reviewed-on: https://code-review.googlesource.com/2260
Reviewed-by: Perry Lorier <[email protected]>
Reviewed-by: Paul Wankadia <[email protected]>
4 files changed