Updated with_xs -> immediate, etc...

To be merged at the same time with my PR on ocaml-xenstore.