Final polish on panel & row repeats, #1888, still some missing places where scopedVars needs to be used
