Equity, Adequacy and the Evolving State Role in Education Finance