Fix more style errors.