Style consistency changes.

[ci skip]