Fixing some coding standard violations.