Fix some coding convention violations.

No match.