Correct some coding conventions.