Task #822. Fixed a few coding standard complaints.