Changes to obey our coding conventions

No match.