Apply minor CS fixes.

[ci skip]