Readd conversion of tax scale from marginal to average.