Further simplify NewAssessment