More simplifications to the pretty-printing of OPAM files