Fix deprecated features which break compiler with Ocaml 4.10.