Fix more formatting issues.