Fix some coding style issues.