Matching google's style guide more closely now.

False positives are present in a few places still, though.