MDL-46576 core_grade: General fixup of coding style issues.