Fix upload-haddock to work with old-style PackageSetIdents