ocaml: General improvements to generated code.