More coding standard fixes.