Fix more code formatting issues.