MDL-30852 grade report: More coding guideline cleanups.