ocamlbuild plugin: Improve the workaround for PR#6186