Style tweaks.

Just for @basta and @cvan.