More work cleaning the statistics gathering and calculation. Make
everthing a little more consistent.