Removed a lot of redundant stuff from fernandez-ocaml-noweb