Fix some coding conventions.