Various coding standard fixes.