Fixed for OPAM command-line fixes (bf97af7314e44a3065e2ada68a7d7ff60216531c)