Further coding standards fixes.
Merge pull request #2535 from maximal/patch-1

Further coding standards fixes.