Google: Minor cleanup.