Change over to using ocaml.m4 macros.