Rearrange some averaging things...in preparation for moving averaging to before any barrierHit test, since nonExtremum barrierHit are affected by averaging