A tweak for bug #8030.  It now will do more than one calculation of the averages.