Renamed with_xs/with_xst -> immediate/transaction (like in Mirage)