Adjust for opam API cleanup