Port to the last version of OCaml's trunk