This seems less good than what you're replacing, in the sense that the rubric contents weren't being ignored, and now they are.
Perhaps a dictionary can be prepared as I had in the diff above, and then passed into the constructor for the ```*AssessmentBlock```s?