Adapt to OCaml trunk.