MDL-18229 gradereport: Fixes and improvements from review.