Some API changes. 

This will break opam2web and ocamlot, so creating a PR to let @dsheets comments