so, for textboxes and for text inputs, there is a single field.  We can label field with data-report, and the questionreport can indeed be the data-report in the question div.

For multiple choice questions, there is the "set of choices" (the question), and the individual choices.  The questionreport should be the data-report element associated with the "set-of-choices" (CD competitor, for example), and the report is the data-report associated with each individual choice.
There's actually nowhere to report the data-report attribute associated with the question div.

I can change the other part  (line 693) to the behavior described in this comment (or you can), but I think line 237 should also be changed to match the behavior described in this comment, and I think making  237 match up with  684-687 will do that.