Further updates to OCaml rebuild.