Fix more style issues.