MDL-20250 core_grade: assorted grading style fixes