Updates to main-stats and wiz-stats to remove m_ptr->r_idx.
Merge remote-tracking branch 'myshkin/stats-fix'