Coding standard fixes.