More places NoteDataUtil, NoteDataWithScoring need to be converted to use the new row iteration macros.