Further coding standards fixes.