Fix more coding guideline violations.