Don't need ID any more

12 files changed, 43 insertions, 65 deletions

diff --git a/paludis/elike_package_dep_spec-fwd.hh b/paludis/elike_package_dep_spec-fwd.hh
index 345c25711..c1d222688 100644
--- a/paludis/elike_package_dep_spec-fwd.hh
+++ b/paludis/elike_package_dep_spec-fwd.hh
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -47,14 +47,12 @@ namespace paludis
         PALUDIS_ATTRIBUTE((warn_unused_result)) PALUDIS_VISIBLE;
 
     PackageDepSpec parse_elike_package_dep_spec(const std::string & ss, const ELikePackageDepSpecOptions &,
-            const VersionSpecOptions &,
-            const std::shared_ptr<const PackageID> &)
+            const VersionSpecOptions &)
         PALUDIS_ATTRIBUTE((warn_unused_result)) PALUDIS_VISIBLE;
 
     PartiallyMadePackageDepSpec partial_parse_elike_package_dep_spec(const std::string & ss,
             const ELikePackageDepSpecOptions &,
-            const VersionSpecOptions &,
-            const std::shared_ptr<const PackageID> &)
+            const VersionSpecOptions &)
         PALUDIS_ATTRIBUTE((warn_unused_result)) PALUDIS_VISIBLE;
 
     void elike_check_sanity(const std::string & s) PALUDIS_VISIBLE;
@@ -63,7 +61,7 @@ namespace paludis
             const ELikePackageDepSpecOptions & options,
             const VersionSpecOptions & version_options,
             bool & had_bracket_version_requirements,
-            bool & had_use_requirements, const std::shared_ptr<const PackageID> & id) PALUDIS_VISIBLE;
+            bool & had_use_requirements) PALUDIS_VISIBLE;
 
     void elike_remove_trailing_repo_if_exists(std::string & s, PartiallyMadePackageDepSpec & result,
             const ELikePackageDepSpecOptions & options) PALUDIS_VISIBLE;
diff --git a/paludis/elike_package_dep_spec.cc b/paludis/elike_package_dep_spec.cc
index 572f2d8a3..4dc1ac156 100644
--- a/paludis/elike_package_dep_spec.cc
+++ b/paludis/elike_package_dep_spec.cc
@@ -90,7 +90,7 @@ paludis::elike_remove_trailing_square_bracket_if_exists(std::string & s, Partial
         const ELikePackageDepSpecOptions & options,
         const VersionSpecOptions & version_options,
         bool & had_bracket_version_requirements,
-        bool & had_use_requirements, const std::shared_ptr<const PackageID> & id)
+        bool & had_use_requirements)
 {
     std::string::size_type use_group_p;
     if (std::string::npos == ((use_group_p = s.rfind('['))))
@@ -470,8 +470,7 @@ namespace
 PartiallyMadePackageDepSpec
 paludis::partial_parse_elike_package_dep_spec(
         const std::string & ss, const ELikePackageDepSpecOptions & options,
-        const VersionSpecOptions & version_options,
-        const std::shared_ptr<const PackageID> & id)
+        const VersionSpecOptions & version_options)
 {
     using namespace std::placeholders;
 
@@ -495,15 +494,14 @@ paludis::partial_parse_elike_package_dep_spec(
                 n::remove_trailing_repo_if_exists() = std::bind(&elike_remove_trailing_repo_if_exists, _1, _2, options),
                 n::remove_trailing_slot_if_exists() = std::bind(&elike_remove_trailing_slot_if_exists, _1, _2, options),
                 n::remove_trailing_square_bracket_if_exists() = std::bind(&elike_remove_trailing_square_bracket_if_exists,
-                        _1, _2, options, version_options, std::ref(had_bracket_version_requirements), std::ref(had_use_requirements), id)
+                        _1, _2, options, version_options, std::ref(had_bracket_version_requirements), std::ref(had_use_requirements))
                 ));
 }
 
 PackageDepSpec
 paludis::parse_elike_package_dep_spec(const std::string & ss, const ELikePackageDepSpecOptions & options,
-        const VersionSpecOptions & version_options,
-        const std::shared_ptr<const PackageID> & id)
+        const VersionSpecOptions & version_options)
 {
-    return partial_parse_elike_package_dep_spec(ss, options, version_options, id);
+    return partial_parse_elike_package_dep_spec(ss, options, version_options);
 }
 
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index 51b2aaa10..026a3d592 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -112,12 +112,11 @@ namespace
             const typename ParseStackTypes<T_>::Stack & h,
             const typename ParseStackTypes<T_>::AnnotationsGoHere & annotations_go_here,
             const std::string & s,
-            const EAPI & eapi,
-            const std::shared_ptr<const PackageID> & id)
+            const EAPI & eapi)
     {
         std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
                     parse_elike_package_dep_spec(s, eapi.supported()->package_dep_spec_parse_options(),
-                        eapi.supported()->version_spec_options(), id)));
+                        eapi.supported()->version_spec_options())));
         h.begin()->item()->append(spec);
         call_annotations_go_here(annotations_go_here, spec);
     }
@@ -127,8 +126,7 @@ namespace
             const typename ParseStackTypes<T_>::Stack & h,
             const typename ParseStackTypes<T_>::AnnotationsGoHere & annotations_go_here,
             const std::string & s,
-            const EAPI & eapi,
-            const std::shared_ptr<const PackageID> & id)
+            const EAPI & eapi)
     {
         if ((! s.empty()) && ('!' == s.at(0)))
         {
@@ -151,14 +149,13 @@ namespace
                         s,
                         parse_elike_package_dep_spec(s.substr(specstart),
                             eapi.supported()->package_dep_spec_parse_options(),
-                            eapi.supported()->version_spec_options(),
-                            id),
+                            eapi.supported()->version_spec_options()),
                         strong ? bk_strong : bk_weak));
             h.begin()->item()->append(spec);
             annotations_go_here(spec, spec);
         }
         else
-            package_dep_spec_string_handler<T_>(h, annotations_go_here, s, eapi, id);
+            package_dep_spec_string_handler<T_>(h, annotations_go_here, s, eapi);
     }
 
     template <typename T_>
@@ -509,7 +506,7 @@ paludis::erepository::parse_depend(const std::string & s,
                 n::on_should_be_empty() = std::bind(&should_be_empty_handler<DependencySpecTree>, std::ref(stack), s),
                 n::on_string() = std::bind(&package_or_block_dep_spec_string_handler<DependencySpecTree>, std::ref(stack),
                     ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::bind(
-                            &set_thing_to_annotate_maybe_block, std::ref(thing_to_annotate), _1, std::ref(thing_to_annotate_if_block), _2)), _1, eapi, id),
+                            &set_thing_to_annotate_maybe_block, std::ref(thing_to_annotate), _1, std::ref(thing_to_annotate_if_block), _2)), _1, eapi),
                 n::on_use() = std::bind(&use_handler<DependencySpecTree>, std::ref(stack), _1, env, id, std::cref(eapi)),
                 n::on_use_under_any() = std::bind(&use_under_any_handler, s, std::cref(eapi))
             ));
@@ -549,7 +546,7 @@ paludis::erepository::parse_provide(const std::string & s,
                 n::on_should_be_empty() = std::bind(&should_be_empty_handler<ProvideSpecTree>, std::ref(stack), s),
                 n::on_string() = std::bind(&package_dep_spec_string_handler<ProvideSpecTree>, std::ref(stack),
                     ParseStackTypes<ProvideSpecTree>::AnnotationsGoHere(std::bind(
-                            &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), _1, std::cref(eapi), id),
+                            &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), _1, std::cref(eapi)),
                 n::on_use() = std::bind(&use_handler<ProvideSpecTree>, std::ref(stack), _1, env, id, std::cref(eapi)),
                 n::on_use_under_any() = std::bind(&use_under_any_handler, s, std::cref(eapi))
             ));
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 471d3acd4..4f56a4a0b 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -640,8 +640,7 @@ ERepository::repository_masked(const std::shared_ptr<const PackageID> & id) cons
             {
                 std::shared_ptr<const PackageDepSpec> a(std::make_shared<PackageDepSpec>(parse_elike_package_dep_spec(
                                 line->second.first, line->first->supported()->package_dep_spec_parse_options(),
-                                line->first->supported()->version_spec_options(),
-                                std::shared_ptr<const PackageID>())));
+                                line->first->supported()->version_spec_options())));
                 if (a->package_ptr())
                     _imp->repo_mask[*a->package_ptr()].push_back(std::make_pair(a, line->second.second));
                 else
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index d37d1fca6..f511c595c 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -177,8 +177,7 @@ ERepositoryNews::update_news() const
                     if (! (*_imp->environment)[selection::SomeArbitraryVersion(
                                 generator::Matches(PackageDepSpec(parse_elike_package_dep_spec(*i,
                                             eapi.supported()->package_dep_spec_parse_options(),
-                                            eapi.supported()->version_spec_options(),
-                                            std::shared_ptr<const PackageID>())), make_null_shared_ptr(), { }) |
+                                            eapi.supported()->version_spec_options())), make_null_shared_ptr(), { }) |
                                 filter::InstalledAtRoot(_imp->environment->preferred_root_key()->value()))]->empty())
                         local_show = true;
                 show &= local_show;
diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc
index beae1cc51..ac2354a9a 100644
--- a/paludis/repositories/e/exheres_profile.cc
+++ b/paludis/repositories/e/exheres_profile.cc
@@ -160,8 +160,7 @@ ExheresProfile::ExheresProfile(
             std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
                         parse_elike_package_dep_spec(i->second.substr(1),
                             i->first->supported()->package_dep_spec_parse_options(),
-                            i->first->supported()->version_spec_options(),
-                            std::shared_ptr<const PackageID>())));
+                            i->first->supported()->version_spec_options())));
 
             spec->set_tag(_imp->system_tag);
             _imp->system_packages->top()->append(spec);
@@ -178,8 +177,7 @@ ExheresProfile::ExheresProfile(
             std::shared_ptr<const PackageDepSpec> a(std::make_shared<PackageDepSpec>(
                         parse_elike_package_dep_spec(line->second.first,
                             line->first->supported()->package_dep_spec_parse_options(),
-                            line->first->supported()->version_spec_options(),
-                            std::shared_ptr<const PackageID>())));
+                            line->first->supported()->version_spec_options())));
 
             if (a->package_ptr())
                 _imp->package_mask[*a->package_ptr()].push_back(std::make_pair(a, line->second.second));
diff --git a/paludis/repositories/e/info_metadata_key.cc b/paludis/repositories/e/info_metadata_key.cc
index ec16cb699..7522f009f 100644
--- a/paludis/repositories/e/info_metadata_key.cc
+++ b/paludis/repositories/e/info_metadata_key.cc
@@ -189,8 +189,7 @@ InfoPkgsMetadataKey::need_keys_added() const
             std::shared_ptr<const PackageIDSequence> q((*_imp->env)[selection::AllVersionsSorted(
                         generator::Matches(parse_elike_package_dep_spec(i->first,
                                 eapi->supported()->package_dep_spec_parse_options(),
-                                eapi->supported()->version_spec_options(),
-                                std::shared_ptr<const PackageID>()), make_null_shared_ptr(), { }) |
+                                eapi->supported()->version_spec_options()), make_null_shared_ptr(), { }) |
                         filter::InstalledAtRoot(_imp->env->preferred_root_key()->value()))]);
 
             if (q->empty())
diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc
index 46e9bc8a9..b4f46fc8f 100644
--- a/paludis/repositories/e/pipe_command_handler.cc
+++ b/paludis/repositories/e/pipe_command_handler.cc
@@ -275,7 +275,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
 
                 PackageDepSpec spec(parse_elike_package_dep_spec(tokens[3],
                             eapi->supported()->package_dep_spec_parse_options(),
-                            eapi->supported()->version_spec_options(), package_id));
+                            eapi->supported()->version_spec_options()));
                 std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::AllVersionsSorted(
                             generator::Matches(spec, package_id, { }) | root)]);
                 if (eapi->supported()->pipe_commands()->rewrite_virtuals() && (! entries->empty()) &&
@@ -324,7 +324,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
 
                 PackageDepSpec spec(parse_elike_package_dep_spec(tokens[3],
                             eapi->supported()->package_dep_spec_parse_options(),
-                            eapi->supported()->version_spec_options(), package_id));
+                            eapi->supported()->version_spec_options()));
                 std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::SomeArbitraryVersion(
                             generator::Matches(spec, package_id, { }) | root)]);
                 if (entries->empty())
@@ -348,7 +348,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
 
                 PackageDepSpec spec(parse_elike_package_dep_spec(tokens[2],
                             eapi->supported()->package_dep_spec_parse_options(),
-                            eapi->supported()->version_spec_options(), package_id));
+                            eapi->supported()->version_spec_options()));
                 std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::AllVersionsSorted(
                             generator::Matches(spec, package_id, { }) | filter::InstalledAtRoot(environment->preferred_root_key()->value()))]);
                 if (eapi->supported()->pipe_commands()->rewrite_virtuals() && (! entries->empty()))
diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc
index 94aecd78c..34e4ac34a 100644
--- a/paludis/repositories/e/traditional_profile.cc
+++ b/paludis/repositories/e/traditional_profile.cc
@@ -581,8 +581,7 @@ Imp<TraditionalProfile>::make_vars_from_file_vars()
                 std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
                             parse_elike_package_dep_spec(i->second.substr(1),
                                 i->first->supported()->package_dep_spec_parse_options(),
-                                i->first->supported()->version_spec_options(),
-                                std::shared_ptr<const PackageID>())));
+                                i->first->supported()->version_spec_options())));
 
                 spec->set_tag(system_tag);
                 system_packages->top()->append(spec);
@@ -614,8 +613,7 @@ Imp<TraditionalProfile>::make_vars_from_file_vars()
                 virtuals->erase(v);
                 virtuals->insert(v, parse_elike_package_dep_spec(tokens[1],
                             line->first->supported()->package_dep_spec_parse_options(),
-                            line->first->supported()->version_spec_options(),
-                            std::shared_ptr<const PackageID>()));
+                            line->first->supported()->version_spec_options()));
             }
         }
         catch (const InternalError &)
@@ -639,8 +637,7 @@ Imp<TraditionalProfile>::make_vars_from_file_vars()
             std::shared_ptr<const PackageDepSpec> a(std::make_shared<PackageDepSpec>(
                         parse_elike_package_dep_spec(line->second.first,
                             line->first->supported()->package_dep_spec_parse_options(),
-                            line->first->supported()->version_spec_options(),
-                            std::shared_ptr<const PackageID>())));
+                            line->first->supported()->version_spec_options())));
 
             if (a->package_ptr())
                 package_mask[*a->package_ptr()].push_back(std::make_pair(a, line->second.second));
@@ -722,8 +719,7 @@ Imp<TraditionalProfile>::load_spec_use_file(const EAPI & eapi, const FSPath & fi
         {
             std::shared_ptr<const PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
                         parse_elike_package_dep_spec(*tokens.begin(), eapi.supported()->package_dep_spec_parse_options(),
-                            eapi.supported()->version_spec_options(),
-                            std::shared_ptr<const PackageID>())));
+                            eapi.supported()->version_spec_options())));
             PackageFlagStatusMapList::iterator n(m.insert(m.end(), std::make_pair(spec, FlagStatusMap())));
 
             for (std::list<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
diff --git a/paludis/repositories/fake/dep_parser.cc b/paludis/repositories/fake/dep_parser.cc
index 00330889f..8d30ba0fc 100644
--- a/paludis/repositories/fake/dep_parser.cc
+++ b/paludis/repositories/fake/dep_parser.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -48,21 +48,18 @@ namespace
     };
 
     template <typename T_>
-    void package_dep_spec_string_handler(const typename ParseStackTypes<T_>::Stack & h, const std::string & s,
-            const std::shared_ptr<const PackageID> & id)
+    void package_dep_spec_string_handler(const typename ParseStackTypes<T_>::Stack & h, const std::string & s)
     {
         PackageDepSpec p(parse_elike_package_dep_spec(s, ELikePackageDepSpecOptions() + epdso_allow_slot_deps
                     + epdso_allow_slot_star_deps + epdso_allow_slot_equal_deps + epdso_allow_repository_deps
                     + epdso_allow_use_deps + epdso_allow_ranged_deps + epdso_allow_tilde_greater_deps
                     + epdso_strict_parsing,
-                    user_version_spec_options(),
-                    id));
+                    user_version_spec_options()));
         (*h.begin())->append(std::make_shared<PackageDepSpec>(p));
     }
 
     template <typename T_>
-    void package_or_block_dep_spec_string_handler(const typename ParseStackTypes<T_>::Stack & h, const std::string & s,
-            const std::shared_ptr<const PackageID> & id)
+    void package_or_block_dep_spec_string_handler(const typename ParseStackTypes<T_>::Stack & h, const std::string & s)
     {
         if ((! s.empty()) && ('!' == s.at(0)))
         {
@@ -72,11 +69,10 @@ namespace
                                 + epdso_allow_slot_star_deps + epdso_allow_slot_equal_deps + epdso_allow_repository_deps
                                 + epdso_allow_use_deps + epdso_allow_ranged_deps + epdso_allow_tilde_greater_deps
                                 + epdso_strict_parsing,
-                                user_version_spec_options(),
-                                id), bk_weak));
+                                user_version_spec_options()), bk_weak));
         }
         else
-            package_dep_spec_string_handler<T_>(h, s, id);
+            package_dep_spec_string_handler<T_>(h, s);
     }
 
     template <typename T_>
@@ -171,7 +167,7 @@ namespace
 
 std::shared_ptr<DependencySpecTree>
 paludis::fakerepository::parse_depend(const std::string & s,
-        const Environment * const, const std::shared_ptr<const PackageID> & id)
+        const Environment * const, const std::shared_ptr<const PackageID> &)
 {
     using namespace std::placeholders;
 
@@ -190,7 +186,7 @@ paludis::fakerepository::parse_depend(const std::string & s,
                 n::on_label() = std::bind(&labels_not_allowed_handler, s, _1),
                 n::on_pop() = std::bind(&pop_handler<DependencySpecTree>, std::ref(stack), s),
                 n::on_should_be_empty() = std::bind(&should_be_empty_handler<DependencySpecTree>, std::ref(stack), s),
-                n::on_string() = std::bind(&package_or_block_dep_spec_string_handler<DependencySpecTree>, std::ref(stack), _1, id),
+                n::on_string() = std::bind(&package_or_block_dep_spec_string_handler<DependencySpecTree>, std::ref(stack), _1),
                 n::on_use() = std::bind(&use_handler<DependencySpecTree>, std::ref(stack), _1),
                 n::on_use_under_any() = &do_nothing
                 ));
@@ -202,7 +198,7 @@ paludis::fakerepository::parse_depend(const std::string & s,
 
 std::shared_ptr<ProvideSpecTree>
 paludis::fakerepository::parse_provide(const std::string & s,
-        const Environment * const, const std::shared_ptr<const PackageID> & id)
+        const Environment * const, const std::shared_ptr<const PackageID> &)
 {
     using namespace std::placeholders;
 
@@ -221,7 +217,7 @@ paludis::fakerepository::parse_provide(const std::string & s,
                 n::on_label() = std::bind(&labels_not_allowed_handler, s, _1),
                 n::on_pop() = std::bind(&pop_handler<ProvideSpecTree>, std::ref(stack), s),
                 n::on_should_be_empty() = std::bind(&should_be_empty_handler<ProvideSpecTree>, std::ref(stack), s),
-                n::on_string() = std::bind(&package_dep_spec_string_handler<ProvideSpecTree>, std::ref(stack), _1, id),
+                n::on_string() = std::bind(&package_dep_spec_string_handler<ProvideSpecTree>, std::ref(stack), _1),
                 n::on_use() = std::bind(&use_handler<ProvideSpecTree>, std::ref(stack), _1),
                 n::on_use_under_any() = &do_nothing
                 ));
diff --git a/paludis/resolver/package_or_block_dep_spec.cc b/paludis/resolver/package_or_block_dep_spec.cc
index 059031ea4..82f9731a2 100644
--- a/paludis/resolver/package_or_block_dep_spec.cc
+++ b/paludis/resolver/package_or_block_dep_spec.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2010 Ciaran McCreesh
+ * Copyright (c) 2010, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -98,7 +98,7 @@ PackageOrBlockDepSpec::serialise(Serialiser & s) const
 }
 
 PackageOrBlockDepSpec
-PackageOrBlockDepSpec::deserialise(Deserialisation & d, const std::shared_ptr<const PackageID> & for_id)
+PackageOrBlockDepSpec::deserialise(Deserialisation & d, const std::shared_ptr<const PackageID> &)
 {
     Context context("When deserialising:");
 
@@ -112,8 +112,7 @@ PackageOrBlockDepSpec::deserialise(Deserialisation & d, const std::shared_ptr<co
                 epdso_allow_slot_equal_deps, epdso_allow_slot_deps, epdso_allow_key_requirements,
                 epdso_allow_use_dep_question_defaults },
                 { vso_flexible_dashes, vso_flexible_dots, vso_ignore_case,
-                vso_letters_anywhere, vso_dotted_suffixes },
-                for_id));
+                vso_letters_anywhere, vso_dotted_suffixes }));
 
     auto annotations(std::make_shared<DepSpecAnnotations>());
     for (int a(0), a_end(v.member<int>("annotations_count")) ;
diff --git a/paludis/serialise.cc b/paludis/serialise.cc
index 43f256700..d7cc022a6 100644
--- a/paludis/serialise.cc
+++ b/paludis/serialise.cc
@@ -377,8 +377,7 @@ DeserialisatorHandler<std::shared_ptr<const PackageID> >::handle(Deserialisation
                         epdso_allow_slot_equal_deps, epdso_allow_slot_deps, epdso_allow_key_requirements,
                         epdso_allow_use_dep_question_defaults },
                         { vso_flexible_dashes, vso_flexible_dots, vso_ignore_case,
-                        vso_letters_anywhere, vso_dotted_suffixes },
-                        make_null_shared_ptr()), make_null_shared_ptr(), { }))]->begin();
+                        vso_letters_anywhere, vso_dotted_suffixes }), make_null_shared_ptr(), { }))]->begin();
 }
 
 template class Pimp<Deserialiser>;