Clean-ups: OPAM now compiles with -warning-error A -w +A-4-9