Coding standards fixes.
Merge pull request #2533 from maximal/patch-1

Coding standards fixes.