Fix more checking of style.