Move the stats reset strictly after stats display, so the total message count is shown correctly.
Merge branch 'more-stats'