Additional coding standards fixes.