More stylistic fixes.