Ethanol subsidies in tax deal