I thought about that - but had a few worries.  scope creep (since this really was just a "lets fix the stats" pass), causing conflicts with other PRs that get into some of the same code, and my own general lack of ability..

perhaps it would be a good second pass after current PRs get submitted?