Fixed up some coding standards issues.