Senate bill seeks end to FET — but raises highway funding questions