More refactoring and cleaning of OpamBinary