BROKEN COMMIT: YAOOF (Yet an other Ocaml fix)