More coding standard corrections.
Merge pull request #3416 from dereuromark/master-strict

More coding standard corrections.