Reduce over-engineering of average and marginal rates computations.