CR changes, including renaming of Statistics struct to Stats.