chroot::facet::facet: Remove chroot parameter from all methods

Use internal "owner" member instead.

33 files changed, 248 insertions, 369 deletions

diff --git a/lib/sbuild/chroot/chroot.cc b/lib/sbuild/chroot/chroot.cc
index af5f25f0..32872e16 100644
--- a/lib/sbuild/chroot/chroot.cc
+++ b/lib/sbuild/chroot/chroot.cc
@@ -560,7 +560,7 @@ namespace sbuild
               static_cast<bool>(get_session_flags() & SESSION_PURGE));
 
       for (const auto& facet : facets)
-        facet->setup_env(*this, env);
+        facet->setup_env(env);
     }
 
     void
@@ -590,7 +590,7 @@ namespace sbuild
       session_flags flags = SESSION_NOFLAGS;
 
       for (const auto& facet : facets)
-        flags = flags | facet->get_session_flags(*this);
+        flags = flags | facet->get_session_flags();
 
       return flags;
     }
@@ -632,7 +632,7 @@ namespace sbuild
         detail.add(_("Path"), get_path());
 
       for (const auto& facet : facets)
-        facet->get_details(*this, detail);
+        facet->get_details(detail);
     }
 
     void
@@ -762,7 +762,7 @@ namespace sbuild
                                 "shell");
 
       for (const auto& facet : facets)
-        facet->get_keyfile(*this, keyfile);
+        facet->get_keyfile(keyfile);
     }
 
     void
@@ -852,7 +852,7 @@ namespace sbuild
                                 keyfile::PRIORITY_OPTIONAL);
 
       for (const auto& facet : facets)
-        facet->set_keyfile(*this, keyfile);
+        facet->set_keyfile(keyfile);
     }
 
   }
diff --git a/lib/sbuild/chroot/facet/block-device-base.cc b/lib/sbuild/chroot/facet/block-device-base.cc
index 47eacee0..d3ca94b2 100644
--- a/lib/sbuild/chroot/facet/block-device-base.cc
+++ b/lib/sbuild/chroot/facet/block-device-base.cc
@@ -93,15 +93,13 @@ namespace sbuild
       }
 
       void
-      block_device_base::setup_env (chroot const& chroot,
-                                    environment& env) const
+      block_device_base::setup_env (environment& env) const
       {
         env.add("CHROOT_DEVICE", get_device());
       }
 
       void
-      block_device_base::get_details (chroot const& chroot,
-                                      format_detail& detail) const
+      block_device_base::get_details (format_detail& detail) const
       {
         if (!this->device.empty())
           detail.add(_("Device"), get_device());
@@ -114,19 +112,17 @@ namespace sbuild
       }
 
       void
-      block_device_base::get_keyfile (chroot const& chroot,
-                                      keyfile&      keyfile) const
+      block_device_base::get_keyfile (keyfile& keyfile) const
       {
         keyfile::set_object_value(*this, &block_device_base::get_device,
-                                  keyfile, chroot.get_name(), "device");
+                                  keyfile, owner->get_name(), "device");
       }
 
       void
-      block_device_base::set_keyfile (chroot&        chroot,
-                                      keyfile const& keyfile)
+      block_device_base::set_keyfile (keyfile const& keyfile)
       {
         keyfile::get_object_value(*this, &block_device_base::set_device,
-                                  keyfile, chroot.get_name(), "device",
+                                  keyfile, owner->get_name(), "device",
                                   keyfile::PRIORITY_REQUIRED);
       }
 
diff --git a/lib/sbuild/chroot/facet/block-device-base.h b/lib/sbuild/chroot/facet/block-device-base.h
index 4e5bc35d..18287f6c 100644
--- a/lib/sbuild/chroot/facet/block-device-base.h
+++ b/lib/sbuild/chroot/facet/block-device-base.h
@@ -87,24 +87,20 @@ namespace sbuild
         get_path () const;
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
       protected:
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
         /// The block device to use.
         std::string device;
diff --git a/lib/sbuild/chroot/facet/btrfs-snapshot.cc b/lib/sbuild/chroot/facet/btrfs-snapshot.cc
index 8f68ea72..2cf41822 100644
--- a/lib/sbuild/chroot/facet/btrfs-snapshot.cc
+++ b/lib/sbuild/chroot/facet/btrfs-snapshot.cc
@@ -158,10 +158,9 @@ namespace sbuild
       }
 
       void
-      btrfs_snapshot::setup_env (chroot const& chroot,
-                                 environment&  env) const
+      btrfs_snapshot::setup_env (environment& env) const
       {
-        storage::setup_env(chroot, env);
+        storage::setup_env(env);
 
         env.add("CHROOT_BTRFS_SOURCE_SUBVOLUME", get_source_subvolume());
         env.add("CHROOT_BTRFS_SNAPSHOT_DIRECTORY", get_snapshot_directory());
@@ -183,7 +182,7 @@ namespace sbuild
       }
 
       chroot::session_flags
-      btrfs_snapshot::get_session_flags (chroot const& chroot) const
+      btrfs_snapshot::get_session_flags () const
       {
         chroot::session_flags flags = chroot::SESSION_NOFLAGS;
 
@@ -194,10 +193,9 @@ namespace sbuild
       }
 
       void
-      btrfs_snapshot::get_details (chroot const&  chroot,
-                                   format_detail& detail) const
+      btrfs_snapshot::get_details (format_detail& detail) const
       {
-        storage::get_details(chroot, detail);
+        storage::get_details(detail);
 
         if (!this->get_source_subvolume().empty())
           detail.add(_("Btrfs Source Subvolume"), get_source_subvolume());
@@ -218,56 +216,54 @@ namespace sbuild
       }
 
       void
-      btrfs_snapshot::get_keyfile (chroot const& chroot,
-                                   keyfile&      keyfile) const
+      btrfs_snapshot::get_keyfile (keyfile& keyfile) const
       {
-        storage::get_keyfile(chroot, keyfile);
+        storage::get_keyfile(keyfile);
 
         bool issession = static_cast<bool>(owner->get_facet<session>());
 
         if (!issession)
           keyfile::set_object_value(*this,
                                     &btrfs_snapshot::get_source_subvolume,
-                                    keyfile, chroot.get_name(),
+                                    keyfile, owner->get_name(),
                                     "btrfs-source-subvolume");
 
         if (!issession)
           keyfile::set_object_value(*this,
                                     &btrfs_snapshot::get_snapshot_directory,
-                                    keyfile, chroot.get_name(),
+                                    keyfile, owner->get_name(),
                                     "btrfs-snapshot-directory");
 
         if (issession)
           keyfile::set_object_value(*this,
                                     &btrfs_snapshot::get_snapshot_name,
-                                    keyfile, chroot.get_name(),
+                                    keyfile, owner->get_name(),
                                     "btrfs-snapshot-name");
       }
 
       void
-      btrfs_snapshot::set_keyfile (chroot&        chroot,
-                                   keyfile const& keyfile)
+      btrfs_snapshot::set_keyfile (keyfile const& keyfile)
       {
-        storage::set_keyfile(chroot, keyfile);
+        storage::set_keyfile(keyfile);
 
         bool issession = static_cast<bool>(owner->get_facet<session>());
 
         keyfile::get_object_value(*this, &btrfs_snapshot::set_source_subvolume,
-                                  keyfile, chroot.get_name(), "btrfs-source-subvolume",
+                                  keyfile, owner->get_name(), "btrfs-source-subvolume",
                                   issession ?
                                   keyfile::PRIORITY_DISALLOWED :
                                   keyfile::PRIORITY_REQUIRED
                                   ); // Only needed for creating snapshot, not using snapshot
 
         keyfile::get_object_value(*this, &btrfs_snapshot::set_snapshot_directory,
-                                  keyfile, chroot.get_name(), "btrfs-snapshot-directory",
+                                  keyfile, owner->get_name(), "btrfs-snapshot-directory",
                                   issession ?
                                   keyfile::PRIORITY_DISALLOWED :
                                   keyfile::PRIORITY_REQUIRED
                                   ); // Only needed for creating snapshot, not using snapshot
 
         keyfile::get_object_value(*this, &btrfs_snapshot::set_snapshot_name,
-                                  keyfile, chroot.get_name(), "btrfs-snapshot-name",
+                                  keyfile, owner->get_name(), "btrfs-snapshot-name",
                                   issession ?
                                   keyfile::PRIORITY_REQUIRED :
                                   keyfile::PRIORITY_DISALLOWED);
diff --git a/lib/sbuild/chroot/facet/btrfs-snapshot.h b/lib/sbuild/chroot/facet/btrfs-snapshot.h
index 78d5703e..7423faed 100644
--- a/lib/sbuild/chroot/facet/btrfs-snapshot.h
+++ b/lib/sbuild/chroot/facet/btrfs-snapshot.h
@@ -137,11 +137,10 @@ namespace sbuild
         get_path () const;
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
         virtual chroot::session_flags
-        get_session_flags (chroot const& chroot) const;
+        get_session_flags () const;
 
       protected:
         virtual void
@@ -150,19 +149,16 @@ namespace sbuild
                     int                status);
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
         virtual void
         chroot_session_setup (chroot const&      parent,
diff --git a/lib/sbuild/chroot/facet/custom.cc b/lib/sbuild/chroot/facet/custom.cc
index 5845772b..cf729f8d 100644
--- a/lib/sbuild/chroot/facet/custom.cc
+++ b/lib/sbuild/chroot/facet/custom.cc
@@ -130,10 +130,9 @@ namespace sbuild
       }
 
       void
-      custom::setup_env (chroot const& chroot,
-                         environment& env) const
+      custom::setup_env (environment& env) const
       {
-        storage::setup_env(chroot, env);
+        storage::setup_env(env);
       }
 
       void
@@ -153,13 +152,13 @@ namespace sbuild
       }
 
       chroot::session_flags
-      custom::get_session_flags (chroot const& chroot) const
+      custom::get_session_flags () const
       {
         chroot::session_flags flags = chroot::SESSION_NOFLAGS;
 
         // TODO: Only set if purge is set.
 
-        if (chroot.get_facet<session>() &&
+        if (owner->get_facet<session>() &&
             get_session_purgeable())
           flags = chroot::SESSION_PURGE;
 
@@ -167,10 +166,9 @@ namespace sbuild
       }
 
       void
-      custom::get_details (chroot const&  chroot,
-                           format_detail& detail) const
+      custom::get_details (format_detail& detail) const
       {
-        storage::get_details(chroot, detail);
+        storage::get_details(detail);
       }
 
       void
@@ -184,37 +182,35 @@ namespace sbuild
       }
 
       void
-      custom::get_keyfile (chroot const& chroot,
-                           keyfile&      keyfile) const
+      custom::get_keyfile (keyfile& keyfile) const
       {
-        storage::get_keyfile(chroot, keyfile);
+        storage::get_keyfile(keyfile);
 
         keyfile::set_object_value(*this,
                                   &custom::get_session_purgeable,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "custom-session-purgeable");
       }
 
       void
-      custom::set_keyfile (chroot& chroot,
-                           keyfile const& keyfile)
+      custom::set_keyfile (keyfile const& keyfile)
       {
-        storage::set_keyfile(chroot, keyfile);
+        storage::set_keyfile(keyfile);
 
-        bool is_session = static_cast<bool>(chroot.get_facet<session>());
+        bool is_session = static_cast<bool>(owner->get_facet<session>());
 
         keyfile::get_object_value(*this, &custom::set_session_cloneable,
-                                  keyfile, chroot.get_name(), "custom-session-cloneable",
+                                  keyfile, owner->get_name(), "custom-session-cloneable",
                                   is_session ?
                                   keyfile::PRIORITY_DISALLOWED :
                                   keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_value(*this, &custom::set_session_purgeable,
-                                  keyfile, chroot.get_name(), "custom-session-purgeable",
+                                  keyfile, owner->get_name(), "custom-session-purgeable",
                                   keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_value(*this, &custom::set_source_cloneable,
-                                  keyfile, chroot.get_name(), "custom-source-cloneable",
+                                  keyfile, owner->get_name(), "custom-source-cloneable",
                                   is_session ?
                                   keyfile::PRIORITY_DISALLOWED :
                                   keyfile::PRIORITY_OPTIONAL);
diff --git a/lib/sbuild/chroot/facet/custom.h b/lib/sbuild/chroot/facet/custom.h
index 6f3b9272..99d7c9f0 100644
--- a/lib/sbuild/chroot/facet/custom.h
+++ b/lib/sbuild/chroot/facet/custom.h
@@ -117,14 +117,13 @@ namespace sbuild
         set_source_cloneable (bool cloneable);
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
         std::string
         get_path () const;
 
         virtual chroot::session_flags
-        get_session_flags (chroot const& chroot) const;
+        get_session_flags () const;
 
       protected:
         virtual void
@@ -133,19 +132,16 @@ namespace sbuild
                     int                status);
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
       private:
         bool purgeable;
diff --git a/lib/sbuild/chroot/facet/directory-base.cc b/lib/sbuild/chroot/facet/directory-base.cc
index a8c2b8ba..2240550e 100644
--- a/lib/sbuild/chroot/facet/directory-base.cc
+++ b/lib/sbuild/chroot/facet/directory-base.cc
@@ -68,15 +68,13 @@ namespace sbuild
       }
 
       void
-      directory_base::setup_env (chroot const& chroot,
-                                 environment& env) const
+      directory_base::setup_env (environment& env) const
       {
         env.add("CHROOT_DIRECTORY", get_directory());
       }
 
       void
-      directory_base::get_details (chroot const& chroot,
-                                   format_detail& detail) const
+      directory_base::get_details (format_detail& detail) const
       {
         detail.add(_("Directory"), get_directory());
       }
@@ -89,29 +87,27 @@ namespace sbuild
       }
 
       void
-      directory_base::get_keyfile (chroot const& chroot,
-                                   keyfile& keyfile) const
+      directory_base::get_keyfile (keyfile& keyfile) const
       {
         keyfile::set_object_value(*this, &directory_base::get_directory,
-                                  keyfile, chroot.get_name(), "directory");
+                                  keyfile, owner->get_name(), "directory");
       }
 
       void
-      directory_base::set_keyfile (chroot&        chroot,
-                                   keyfile const& keyfile)
+      directory_base::set_keyfile (keyfile const& keyfile)
       {
         // "directory" should be required, but we also accept "location" as
         // an alternative (but deprecated) variant.  Therefore, ensure by
         // hand that one of them is defined, but not both.
 
-        bool directory_key = keyfile.has_key(chroot.get_name(), "directory");
-        bool location_key = keyfile.has_key(chroot.get_name(), "location");
+        bool directory_key = keyfile.has_key(owner->get_name(), "directory");
+        bool location_key = keyfile.has_key(owner->get_name(), "location");
 
         keyfile::priority directory_priority = keyfile::PRIORITY_OPTIONAL;
         keyfile::priority location_priority = keyfile::PRIORITY_OBSOLETE;
 
         if (!directory_key && !location_key)
-          throw keyfile::error(chroot.get_name(), keyfile::MISSING_KEY_NL, "directory");
+          throw keyfile::error(owner->get_name(), keyfile::MISSING_KEY_NL, "directory");
 
         // Using both keys is not allowed (which one is the correct one?),
         // so force an exception to be thrown when reading the old location
@@ -120,11 +116,11 @@ namespace sbuild
           location_priority = keyfile::PRIORITY_DISALLOWED;
 
         keyfile::get_object_value(*this, &directory_base::set_directory,
-                                  keyfile, chroot.get_name(), "directory",
+                                  keyfile, owner->get_name(), "directory",
                                   directory_priority);
 
         keyfile::get_object_value(*this, &directory_base::set_directory,
-                                  keyfile, chroot.get_name(), "location",
+                                  keyfile, owner->get_name(), "location",
                                   location_priority);
       }
 
diff --git a/lib/sbuild/chroot/facet/directory-base.h b/lib/sbuild/chroot/facet/directory-base.h
index 06ca907d..f3cdf21f 100644
--- a/lib/sbuild/chroot/facet/directory-base.h
+++ b/lib/sbuild/chroot/facet/directory-base.h
@@ -78,24 +78,20 @@ namespace sbuild
         set_directory (std::string const& directory);
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
       protected:
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
         /// The directory to use.
         std::string directory;
diff --git a/lib/sbuild/chroot/facet/facet.cc b/lib/sbuild/chroot/facet/facet.cc
index 9cc44e77..d9402d1f 100644
--- a/lib/sbuild/chroot/facet/facet.cc
+++ b/lib/sbuild/chroot/facet/facet.cc
@@ -58,20 +58,18 @@ namespace sbuild
       }
 
       void
-      facet::setup_env (chroot const& chroot,
-                        environment&  env) const
+      facet::setup_env (environment& env) const
       {
       }
 
       chroot::session_flags
-      facet::get_session_flags (chroot const& chroot) const
+      facet::get_session_flags () const
       {
         return chroot::SESSION_NOFLAGS;
       }
 
       void
-      facet::get_details (chroot const&  chroot,
-                          format_detail& detail) const
+      facet::get_details (format_detail& detail) const
       {
       }
 
@@ -81,14 +79,12 @@ namespace sbuild
       }
 
       void
-      facet::get_keyfile (chroot const& chroot,
-                          keyfile&      keyfile) const
+      facet::get_keyfile (keyfile& keyfile) const
       {
       }
 
       void
-      facet::set_keyfile (chroot&        chroot,
-                          keyfile const& keyfile)
+      facet::set_keyfile (keyfile const& keyfile)
       {
       }
 
diff --git a/lib/sbuild/chroot/facet/facet.h b/lib/sbuild/chroot/facet/facet.h
index 5550ba71..78295904 100644
--- a/lib/sbuild/chroot/facet/facet.h
+++ b/lib/sbuild/chroot/facet/facet.h
@@ -98,12 +98,10 @@ namespace sbuild
          * Set environment.  Set the environment that the setup scripts
          * will see during execution.
          *
-         * @param chroot the chroot to use.
          * @param env the environment to set.
          */
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
         /**
          * Get the session flags of the chroot.  These determine how the
@@ -113,17 +111,15 @@ namespace sbuild
          * @returns the session flags.
          */
         virtual chroot::session_flags
-        get_session_flags (chroot const& chroot) const;
+        get_session_flags () const;
 
         /**
          * Get detailed information about the chroot for output.
          *
-         * @param chroot the chroot to use.
          * @param detail the details to output to.
          */
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         /**
          * Get a list of the keys used during keyfile parsing.
@@ -138,25 +134,20 @@ namespace sbuild
          * with the name of the chroot will be set; if it already exists,
          * it will be removed before setting it.
          *
-         * @param chroot the chroot to use.
          * @param keyfile the keyfile to use.
          */
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         /**
          * Set the chroot properties from a keyfile.  The chroot name must
          * have previously been set, so that the correct keyfile group may
          * be determined.
          *
-         * @param chroot the chroot to use.
          * @param keyfile the keyfile to get the properties from.
-         * @param used_keys a list of the keys used will be set.
          */
         virtual void
-        set_keyfile (chroot&         chroot,
-                     keyfile const&  keyfile);
+        set_keyfile (keyfile const& keyfile);
 
       protected:
         /// Chroot owning this facet.
diff --git a/lib/sbuild/chroot/facet/file.cc b/lib/sbuild/chroot/facet/file.cc
index 59fe3db8..f3838b58 100644
--- a/lib/sbuild/chroot/facet/file.cc
+++ b/lib/sbuild/chroot/facet/file.cc
@@ -159,10 +159,9 @@ namespace sbuild
       }
 
       void
-      file::setup_env (chroot const& chroot,
-                       environment&  env) const
+      file::setup_env (environment& env) const
       {
-        storage::setup_env(chroot, env);
+        storage::setup_env(env);
 
         env.add("CHROOT_FILE", get_filename());
         env.add("CHROOT_LOCATION", get_location());
@@ -201,21 +200,20 @@ namespace sbuild
       }
 
       chroot::session_flags
-      file::get_session_flags (chroot const& chroot) const
+      file::get_session_flags () const
       {
         chroot::session_flags flags = chroot::SESSION_NOFLAGS;
 
-        if (chroot.get_facet<session>())
+        if (owner->get_facet<session>())
           flags = chroot::SESSION_PURGE;
 
         return flags;
       }
 
       void
-      file::get_details (chroot const&  chroot,
-                         format_detail& detail) const
+      file::get_details (format_detail& detail) const
       {
-        storage::get_details(chroot, detail);
+        storage::get_details(detail);
 
         if (!this->filename.empty())
           detail
@@ -236,44 +234,42 @@ namespace sbuild
       }
 
       void
-      file::get_keyfile (chroot const& chroot,
-                         keyfile&      keyfile) const
+      file::get_keyfile (keyfile& keyfile) const
       {
-        storage::get_keyfile(chroot, keyfile);
+        storage::get_keyfile(keyfile);
 
-        bool is_session = static_cast<bool>(chroot.get_facet<session>());
+        bool is_session = static_cast<bool>(owner->get_facet<session>());
 
         keyfile::set_object_value(*this, &file::get_filename,
-                                  keyfile, chroot.get_name(), "file");
+                                  keyfile, owner->get_name(), "file");
 
         keyfile::set_object_value(*this, &file::get_location,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "location");
 
         if (is_session)
           keyfile::set_object_value(*this, &file::get_file_repack,
-                                    keyfile, chroot.get_name(), "file-repack");
+                                    keyfile, owner->get_name(), "file-repack");
       }
 
       void
-      file::set_keyfile (chroot&        chroot,
-                         keyfile const& keyfile)
+      file::set_keyfile (keyfile const& keyfile)
       {
-        storage::set_keyfile(chroot, keyfile);
+        storage::set_keyfile(keyfile);
 
-        bool is_session = static_cast<bool>(chroot.get_facet<session>());
+        bool is_session = static_cast<bool>(owner->get_facet<session>());
 
         keyfile::get_object_value(*this, &file::set_filename,
-                                  keyfile, chroot.get_name(), "file",
+                                  keyfile, owner->get_name(), "file",
                                   keyfile::PRIORITY_REQUIRED);
 
         keyfile::get_object_value(*this, &file::set_location,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "location",
                                   keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_value(*this, &file::set_file_repack,
-                                  keyfile, chroot.get_name(), "file-repack",
+                                  keyfile, owner->get_name(), "file-repack",
                                   is_session ?
                                   keyfile::PRIORITY_REQUIRED :
                                   keyfile::PRIORITY_DISALLOWED);
diff --git a/lib/sbuild/chroot/facet/file.h b/lib/sbuild/chroot/facet/file.h
index b48b57fe..5d06891e 100644
--- a/lib/sbuild/chroot/facet/file.h
+++ b/lib/sbuild/chroot/facet/file.h
@@ -132,14 +132,13 @@ namespace sbuild
         set_file_repack (bool repack);
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
         std::string
         get_path () const;
 
         virtual chroot::session_flags
-        get_session_flags (chroot const& chroot) const;
+        get_session_flags () const;
 
       protected:
         virtual void
@@ -148,19 +147,16 @@ namespace sbuild
                     int                status);
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
         virtual void
         chroot_source_setup (chroot const& parent);
diff --git a/lib/sbuild/chroot/facet/fsunion.cc b/lib/sbuild/chroot/facet/fsunion.cc
index d025d81a..7594908a 100644
--- a/lib/sbuild/chroot/facet/fsunion.cc
+++ b/lib/sbuild/chroot/facet/fsunion.cc
@@ -183,8 +183,7 @@ namespace sbuild
       }
 
       void
-      fsunion::setup_env (chroot const& chroot,
-                          environment&  env) const
+      fsunion::setup_env (environment& env) const
       {
         env.add("CHROOT_UNION_TYPE", get_union_type());
         if (get_union_configured())
@@ -199,19 +198,18 @@ namespace sbuild
       }
 
       chroot::session_flags
-      fsunion::get_session_flags (chroot const& chroot) const
+      fsunion::get_session_flags () const
       {
         chroot::session_flags flags = chroot::SESSION_NOFLAGS;
 
-        if (get_union_configured() && chroot.get_facet<session>())
+        if (get_union_configured() && owner->get_facet<session>())
           flags = chroot::SESSION_PURGE;
 
         return flags;
       }
 
       void
-      fsunion::get_details (chroot const& chroot,
-                            format_detail&        detail) const
+      fsunion::get_details (format_detail& detail) const
       {
         detail.add(_("Filesystem Union Type"), get_union_type());
         if (get_union_configured())
@@ -238,59 +236,57 @@ namespace sbuild
       }
 
       void
-      fsunion::get_keyfile (chroot const& chroot,
-                            keyfile&      keyfile) const
+      fsunion::get_keyfile (keyfile& keyfile) const
       {
         keyfile::set_object_value(*this, &fsunion::get_union_type,
-                                  keyfile, chroot.get_name(), "union-type");
+                                  keyfile, owner->get_name(), "union-type");
 
         if (get_union_configured())
           {
             keyfile::set_object_value(*this,
                                       &fsunion::get_union_mount_options,
-                                      keyfile, chroot.get_name(),
+                                      keyfile, owner->get_name(),
                                       "union-mount-options");
 
             keyfile::set_object_value(*this,
                                       &fsunion::get_union_overlay_directory,
-                                      keyfile, chroot.get_name(),
+                                      keyfile, owner->get_name(),
                                       "union-overlay-directory");
 
             keyfile::set_object_value(*this,
                                       &fsunion::get_union_underlay_directory,
-                                      keyfile, chroot.get_name(),
+                                      keyfile, owner->get_name(),
                                       "union-underlay-directory");
           }
       }
 
       void
-      fsunion::set_keyfile (chroot&        chroot,
-                            keyfile const& keyfile)
+      fsunion::set_keyfile (keyfile const& keyfile)
       {
-        bool issession = static_cast<bool>(chroot.get_facet<session>());
+        bool is_session = static_cast<bool>(owner->get_facet<session>());
 
         keyfile::get_object_value(*this, &fsunion::set_union_type,
-                                  keyfile, chroot.get_name(), "union-type",
+                                  keyfile, owner->get_name(), "union-type",
                                   keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_value(*this,
                                   &fsunion::set_union_mount_options,
-                                  keyfile, chroot.get_name(), "union-mount-options",
+                                  keyfile, owner->get_name(), "union-mount-options",
                                   keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_value(*this,
                                   &fsunion::set_union_overlay_directory,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "union-overlay-directory",
-                                  (issession && get_union_configured()) ?
+                                  (is_session && get_union_configured()) ?
                                   keyfile::PRIORITY_REQUIRED :
                                   keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_value(*this,
                                   &fsunion::set_union_underlay_directory,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "union-underlay-directory",
-                                  (issession && get_union_configured()) ?
+                                  (is_session && get_union_configured()) ?
                                   keyfile::PRIORITY_REQUIRED :
                                   keyfile::PRIORITY_OPTIONAL);
       }
diff --git a/lib/sbuild/chroot/facet/fsunion.h b/lib/sbuild/chroot/facet/fsunion.h
index 85819193..e8bf58bd 100644
--- a/lib/sbuild/chroot/facet/fsunion.h
+++ b/lib/sbuild/chroot/facet/fsunion.h
@@ -169,26 +169,22 @@ namespace sbuild
         set_union_underlay_directory (std::string const& directory);
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
         virtual chroot::session_flags
-        get_session_flags (chroot const& chroot) const;
+        get_session_flags () const;
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
         virtual void
         chroot_session_setup (chroot const&      parent,
diff --git a/lib/sbuild/chroot/facet/loopback.cc b/lib/sbuild/chroot/facet/loopback.cc
index 91cbdda9..a66d3f4c 100644
--- a/lib/sbuild/chroot/facet/loopback.cc
+++ b/lib/sbuild/chroot/facet/loopback.cc
@@ -134,10 +134,9 @@ namespace sbuild
       }
 
       void
-      loopback::setup_env (chroot const& chroot,
-                           environment&  env) const
+      loopback::setup_env (environment& env) const
       {
-        storage::setup_env(chroot, env);
+        storage::setup_env(env);
 
         env.add("CHROOT_FILE", get_filename());
       }
@@ -171,10 +170,9 @@ namespace sbuild
       }
 
       void
-      loopback::get_details (chroot const&  chroot,
-                             format_detail& detail) const
+      loopback::get_details (format_detail& detail) const
       {
-        storage::get_details(chroot, detail);
+        storage::get_details(detail);
 
         if (!this->filename.empty())
           detail.add(_("File"), get_filename());
@@ -189,23 +187,21 @@ namespace sbuild
       }
 
       void
-      loopback::get_keyfile (chroot const& chroot,
-                             keyfile&      keyfile) const
+      loopback::get_keyfile (keyfile& keyfile) const
       {
-        storage::get_keyfile(chroot, keyfile);
+        storage::get_keyfile(keyfile);
 
         keyfile::set_object_value(*this, &loopback::get_filename,
-                                  keyfile, chroot.get_name(), "file");
+                                  keyfile, owner->get_name(), "file");
       }
 
       void
-      loopback::set_keyfile (chroot&        chroot,
-                             keyfile const& keyfile)
+      loopback::set_keyfile (keyfile const& keyfile)
       {
-        storage::set_keyfile(chroot, keyfile);
+        storage::set_keyfile(keyfile);
 
         keyfile::get_object_value(*this, &loopback::set_filename,
-                                  keyfile, chroot.get_name(), "file",
+                                  keyfile, owner->get_name(), "file",
                                   keyfile::PRIORITY_REQUIRED);
       }
 
diff --git a/lib/sbuild/chroot/facet/loopback.h b/lib/sbuild/chroot/facet/loopback.h
index b74cab44..fcd6a6e8 100644
--- a/lib/sbuild/chroot/facet/loopback.h
+++ b/lib/sbuild/chroot/facet/loopback.h
@@ -99,8 +99,7 @@ namespace sbuild
         get_path () const;
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
       protected:
         virtual void
@@ -109,19 +108,16 @@ namespace sbuild
                     int                status);
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
         virtual void
         chroot_session_setup (chroot const&      parent,
diff --git a/lib/sbuild/chroot/facet/lvm-snapshot.cc b/lib/sbuild/chroot/facet/lvm-snapshot.cc
index 5e60ed53..ec3506f1 100644
--- a/lib/sbuild/chroot/facet/lvm-snapshot.cc
+++ b/lib/sbuild/chroot/facet/lvm-snapshot.cc
@@ -136,10 +136,9 @@ namespace sbuild
       }
 
       void
-      lvm_snapshot::setup_env (chroot const& chroot,
-                               environment&  env) const
+      lvm_snapshot::setup_env (environment& env) const
       {
-        block_device_base::setup_env(chroot, env);
+        block_device_base::setup_env(env);
 
         env.add("CHROOT_LVM_SNAPSHOT_NAME", sbuild::basename(get_snapshot_device()));
         env.add("CHROOT_LVM_SNAPSHOT_DEVICE", get_snapshot_device());
@@ -194,7 +193,7 @@ namespace sbuild
       }
 
       chroot::session_flags
-      lvm_snapshot::get_session_flags (chroot const& chroot) const
+      lvm_snapshot::get_session_flags () const
       {
         chroot::session_flags flags = chroot::SESSION_NOFLAGS;
 
@@ -205,10 +204,9 @@ namespace sbuild
       }
 
       void
-      lvm_snapshot::get_details (chroot const&  chroot,
-                                 format_detail& detail) const
+      lvm_snapshot::get_details (format_detail& detail) const
       {
-        block_device_base::get_details(chroot, detail);
+        block_device_base::get_details(detail);
 
         if (!this->snapshot_device.empty())
           detail.add(_("LVM Snapshot Device"), get_snapshot_device());
@@ -226,42 +224,40 @@ namespace sbuild
       }
 
       void
-      lvm_snapshot::get_keyfile (chroot const& chroot,
-                                 keyfile& keyfile) const
+      lvm_snapshot::get_keyfile (keyfile& keyfile) const
       {
-        block_device_base::get_keyfile(chroot, keyfile);
+        block_device_base::get_keyfile(keyfile);
 
         session::const_ptr is_session = owner->get_facet<session>();
 
         if (is_session)
           keyfile::set_object_value(*this,
                                     &lvm_snapshot::get_snapshot_device,
-                                    keyfile, chroot.get_name(),
+                                    keyfile, owner->get_name(),
                                     "lvm-snapshot-device");
 
         if (!is_session)
           keyfile::set_object_value(*this,
                                     &lvm_snapshot::get_snapshot_options,
-                                    keyfile, chroot.get_name(),
+                                    keyfile, owner->get_name(),
                                     "lvm-snapshot-options");
       }
 
       void
-      lvm_snapshot::set_keyfile (chroot&        chroot,
-                                 keyfile const& keyfile)
+      lvm_snapshot::set_keyfile (keyfile const& keyfile)
       {
-        block_device_base::set_keyfile(chroot, keyfile);
+        block_device_base::set_keyfile(keyfile);
 
         session::const_ptr is_session = owner->get_facet<session>();
 
         keyfile::get_object_value(*this, &lvm_snapshot::set_snapshot_device,
-                                  keyfile, chroot.get_name(), "lvm-snapshot-device",
+                                  keyfile, owner->get_name(), "lvm-snapshot-device",
                                   is_session ?
                                   keyfile::PRIORITY_REQUIRED :
                                   keyfile::PRIORITY_DISALLOWED);
 
         keyfile::get_object_value(*this, &lvm_snapshot::set_snapshot_options,
-                                  keyfile, chroot.get_name(), "lvm-snapshot-options",
+                                  keyfile, owner->get_name(), "lvm-snapshot-options",
                                   is_session ?
                                   keyfile::PRIORITY_DEPRECATED :
                                   keyfile::PRIORITY_REQUIRED); // Only needed for creating snapshot, not using snapshot
diff --git a/lib/sbuild/chroot/facet/lvm-snapshot.h b/lib/sbuild/chroot/facet/lvm-snapshot.h
index 03ce39bc..bf6ec413 100644
--- a/lib/sbuild/chroot/facet/lvm-snapshot.h
+++ b/lib/sbuild/chroot/facet/lvm-snapshot.h
@@ -114,11 +114,10 @@ namespace sbuild
         set_snapshot_options (std::string const& snapshot_options);
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
         virtual chroot::session_flags
-        get_session_flags (chroot const& chroot) const;
+        get_session_flags () const;
 
       protected:
         virtual void
@@ -127,19 +126,16 @@ namespace sbuild
                     int                status);
 
         virtual void
-        get_details (chroot const& chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile& keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
         virtual void
         chroot_session_setup (chroot const&      parent,
diff --git a/lib/sbuild/chroot/facet/mountable.cc b/lib/sbuild/chroot/facet/mountable.cc
index c58dba6c..88e50c72 100644
--- a/lib/sbuild/chroot/facet/mountable.cc
+++ b/lib/sbuild/chroot/facet/mountable.cc
@@ -124,8 +124,7 @@ namespace sbuild
       }
 
       void
-      mountable::setup_env (chroot const& chroot,
-                            environment&  env) const
+      mountable::setup_env (environment& env) const
       {
         env.add("CHROOT_MOUNT_DEVICE", get_mount_device());
         env.add("CHROOT_MOUNT_OPTIONS", get_mount_options());
@@ -133,8 +132,7 @@ namespace sbuild
       }
 
       void
-      mountable::get_details (chroot const&  chroot,
-                              format_detail& detail) const
+      mountable::get_details (format_detail& detail) const
       {
         if (!get_mount_device().empty())
           detail.add(_("Mount Device"), get_mount_device());
@@ -153,45 +151,43 @@ namespace sbuild
       }
 
       void
-      mountable::get_keyfile (chroot const& chroot,
-                              keyfile&      keyfile) const
+      mountable::get_keyfile (keyfile& keyfile) const
       {
-        bool issession = static_cast<bool>(chroot.get_facet<session>());
+        bool issession = static_cast<bool>(owner->get_facet<session>());
 
         if (issession)
           keyfile::set_object_value(*this, &mountable::get_mount_device,
-                                    keyfile, chroot.get_name(),
+                                    keyfile, owner->get_name(),
                                     "mount-device");
 
         keyfile::set_object_value(*this, &mountable::get_mount_options,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "mount-options");
 
         keyfile::set_object_value(*this, &mountable::get_location,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "location");
       }
 
       void
-      mountable::set_keyfile (chroot&        chroot,
-                              keyfile const& keyfile)
+      mountable::set_keyfile (keyfile const& keyfile)
       {
-        bool issession = static_cast<bool>(chroot.get_facet<session>());
+        bool issession = static_cast<bool>(owner->get_facet<session>());
 
         keyfile::get_object_value(*this, &mountable::set_mount_device,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "mount-device",
                                   issession ?
                                   keyfile::PRIORITY_REQUIRED :
                                   keyfile::PRIORITY_DISALLOWED);
 
         keyfile::get_object_value(*this, &mountable::set_mount_options,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "mount-options",
                                   keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_value(*this, &mountable::set_location,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "location",
                                   keyfile::PRIORITY_OPTIONAL);
       }
diff --git a/lib/sbuild/chroot/facet/mountable.h b/lib/sbuild/chroot/facet/mountable.h
index ea3e094c..4cc401e7 100644
--- a/lib/sbuild/chroot/facet/mountable.h
+++ b/lib/sbuild/chroot/facet/mountable.h
@@ -121,23 +121,19 @@ namespace sbuild
         set_location (std::string const& location);
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
       private:
         /// The device to mount.
diff --git a/lib/sbuild/chroot/facet/personality.cc b/lib/sbuild/chroot/facet/personality.cc
index 8b985ebe..00e35dbe 100644
--- a/lib/sbuild/chroot/facet/personality.cc
+++ b/lib/sbuild/chroot/facet/personality.cc
@@ -91,8 +91,7 @@ namespace sbuild
       }
 
       void
-      personality::get_details (chroot const&  chroot,
-                                format_detail& detail) const
+      personality::get_details (format_detail& detail) const
       {
         // TRANSLATORS: "Personality" is the Linux kernel personality
         // (process execution domain).  See schroot.conf(5).
@@ -106,21 +105,19 @@ namespace sbuild
       }
 
       void
-      personality::get_keyfile (chroot const& chroot,
-                                keyfile&      keyfile) const
+      personality::get_keyfile (keyfile& keyfile) const
       {
         // Only set if defined.
         if (get_persona().get_name() != "undefined")
           keyfile::set_object_value(*this, &personality::get_persona,
-                                    keyfile, chroot.get_name(), "personality");
+                                    keyfile, owner->get_name(), "personality");
       }
 
       void
-      personality::set_keyfile (chroot&        chroot,
-                                keyfile const& keyfile)
+      personality::set_keyfile (keyfile const& keyfile)
       {
         keyfile::get_object_value(*this, &personality::set_persona,
-                                  keyfile, chroot.get_name(), "personality",
+                                  keyfile, owner->get_name(), "personality",
                                   keyfile::PRIORITY_OPTIONAL);
       }
 
diff --git a/lib/sbuild/chroot/facet/personality.h b/lib/sbuild/chroot/facet/personality.h
index 5b2efde5..19f3ffe8 100644
--- a/lib/sbuild/chroot/facet/personality.h
+++ b/lib/sbuild/chroot/facet/personality.h
@@ -80,19 +80,16 @@ namespace sbuild
         set_persona (sbuild::personality const& persona);
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
       private:
         /// Process execution domain (Linux only).
diff --git a/lib/sbuild/chroot/facet/session-clonable.cc b/lib/sbuild/chroot/facet/session-clonable.cc
index f160e49a..99ff8e9a 100644
--- a/lib/sbuild/chroot/facet/session-clonable.cc
+++ b/lib/sbuild/chroot/facet/session-clonable.cc
@@ -168,7 +168,7 @@ namespace sbuild
       }
 
       chroot::session_flags
-      session_clonable::get_session_flags (chroot const& chroot) const
+      session_clonable::get_session_flags () const
       {
         return chroot::SESSION_CREATE;
       }
diff --git a/lib/sbuild/chroot/facet/session-clonable.h b/lib/sbuild/chroot/facet/session-clonable.h
index 4022a4e8..a14be649 100644
--- a/lib/sbuild/chroot/facet/session-clonable.h
+++ b/lib/sbuild/chroot/facet/session-clonable.h
@@ -66,6 +66,9 @@ namespace sbuild
         virtual std::string const&
         get_name () const;
 
+        virtual chroot::session_flags
+        get_session_flags () const;
+
         /**
          * Clone a session chroot.
          *
@@ -80,9 +83,6 @@ namespace sbuild
                        std::string const& alias,
                        std::string const& user,
                        bool               root) const;
-
-        virtual chroot::session_flags
-        get_session_flags (chroot const& chroot) const;
       };
 
     }
diff --git a/lib/sbuild/chroot/facet/session.cc b/lib/sbuild/chroot/facet/session.cc
index 75070c58..014795e2 100644
--- a/lib/sbuild/chroot/facet/session.cc
+++ b/lib/sbuild/chroot/facet/session.cc
@@ -170,8 +170,7 @@ namespace sbuild
       }
 
       void
-      session::setup_env (chroot const& chroot,
-                          environment&  env) const
+      session::setup_env (environment& env) const
       {
         // Add original name to environment, but only if set (otherwise
         // defaults to session ID).
@@ -183,15 +182,14 @@ namespace sbuild
       }
 
       void
-      session::get_details (chroot const&  chroot,
-                            format_detail& detail) const
+      session::get_details (format_detail& detail) const
       {
         if (!get_original_name().empty())
           detail.add(_("Original Chroot Name"), get_original_name());
         if (!get_original_name().empty())
           detail.add(_("Selected Chroot Name"), get_selected_name());
-        if (!chroot.get_name().empty())
-          detail.add(_("Session ID"), chroot.get_name());
+        if (!owner->get_name().empty())
+          detail.add(_("Session ID"), owner->get_name());
       }
 
       void
@@ -207,29 +205,27 @@ namespace sbuild
       }
 
       void
-      session::get_keyfile (chroot const& chroot,
-                            keyfile&      keyfile) const
+      session::get_keyfile (keyfile& keyfile) const
       {
         keyfile::set_object_value(*this, &session::get_original_name,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "original-name");
 
         keyfile::set_object_value(*this, &session::get_selected_name,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "selected-name");
       }
 
       void
-      session::set_keyfile (chroot&        chroot,
-                            keyfile const& keyfile)
+      session::set_keyfile (keyfile const& keyfile)
       {
         keyfile::get_object_value(*this, &session::set_original_name,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "original-name",
                                   keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_value(*this, &session::set_selected_name,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "selected-name",
                                   keyfile::PRIORITY_OPTIONAL);
       }
diff --git a/lib/sbuild/chroot/facet/session.h b/lib/sbuild/chroot/facet/session.h
index 1bf6468c..b19bb621 100644
--- a/lib/sbuild/chroot/facet/session.h
+++ b/lib/sbuild/chroot/facet/session.h
@@ -112,23 +112,19 @@ namespace sbuild
         setup_session_info (bool start);
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
       private:
         /// Original chroot name prior to session cloning.
diff --git a/lib/sbuild/chroot/facet/source-clonable.cc b/lib/sbuild/chroot/facet/source-clonable.cc
index d44bcf4b..d805ec25 100644
--- a/lib/sbuild/chroot/facet/source-clonable.cc
+++ b/lib/sbuild/chroot/facet/source-clonable.cc
@@ -149,10 +149,10 @@ namespace sbuild
       }
 
       chroot::session_flags
-      source_clonable::get_session_flags (chroot const& chroot) const
+      source_clonable::get_session_flags () const
       {
         // Cloning is only possible for non-source and inactive chroots.
-        if (chroot.get_facet<session>())
+        if (owner->get_facet<session>())
           return chroot::SESSION_NOFLAGS;
         else
           return chroot::SESSION_CLONE;
@@ -169,8 +169,7 @@ namespace sbuild
       }
 
       void
-      source_clonable::get_details (chroot const&  chroot,
-                                    format_detail& detail) const
+      source_clonable::get_details (format_detail& detail) const
       {
         detail
           .add(_("Source Users"), get_source_users())
@@ -180,56 +179,54 @@ namespace sbuild
       }
 
       void
-      source_clonable::get_keyfile (chroot const& chroot,
-                                    keyfile&      keyfile) const
+      source_clonable::get_keyfile (keyfile& keyfile) const
       {
         keyfile::set_object_value(*this, &source_clonable::get_source_clone,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "source-clone");
 
         keyfile::set_object_list_value(*this, &source_clonable::get_source_users,
-                                       keyfile, chroot.get_name(),
+                                       keyfile, owner->get_name(),
                                        "source-users");
 
         keyfile::set_object_list_value(*this, &source_clonable::get_source_groups,
-                                       keyfile, chroot.get_name(),
+                                       keyfile, owner->get_name(),
                                        "source-groups");
 
         keyfile::set_object_list_value(*this, &source_clonable::get_source_root_users,
-                                       keyfile, chroot.get_name(),
+                                       keyfile, owner->get_name(),
                                        "source-root-users");
 
         keyfile::set_object_list_value(*this, &source_clonable::get_source_root_groups,
-                                       keyfile, chroot.get_name(),
+                                       keyfile, owner->get_name(),
                                        "source-root-groups");
       }
 
       void
-      source_clonable::set_keyfile (chroot&        chroot,
-                                    keyfile const& keyfile)
+      source_clonable::set_keyfile (keyfile const& keyfile)
       {
         keyfile::get_object_value(*this, &source_clonable::set_source_clone,
-                                  keyfile, chroot.get_name(),
+                                  keyfile, owner->get_name(),
                                   "source-clone",
                                   keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_list_value(*this, &source_clonable::set_source_users,
-                                       keyfile, chroot.get_name(),
+                                       keyfile, owner->get_name(),
                                        "source-users",
                                        keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_list_value(*this, &source_clonable::set_source_groups,
-                                       keyfile, chroot.get_name(),
+                                       keyfile, owner->get_name(),
                                        "source-groups",
                                        keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_list_value(*this, &source_clonable::set_source_root_users,
-                                       keyfile, chroot.get_name(),
+                                       keyfile, owner->get_name(),
                                        "source-root-users",
                                        keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_list_value(*this, &source_clonable::set_source_root_groups,
-                                       keyfile, chroot.get_name(),
+                                       keyfile, owner->get_name(),
                                        "source-root-groups",
                                        keyfile::PRIORITY_OPTIONAL);
       }
diff --git a/lib/sbuild/chroot/facet/source-clonable.h b/lib/sbuild/chroot/facet/source-clonable.h
index 63dc3dba..ecc2d7a7 100644
--- a/lib/sbuild/chroot/facet/source-clonable.h
+++ b/lib/sbuild/chroot/facet/source-clonable.h
@@ -166,22 +166,19 @@ namespace sbuild
         set_source_root_groups (string_list const& groups);
 
         virtual chroot::session_flags
-        get_session_flags (chroot const& chroot) const;
+        get_session_flags () const;
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
       private:
         /// Is source chroot cloning permitted?
diff --git a/lib/sbuild/chroot/facet/unshare.cc b/lib/sbuild/chroot/facet/unshare.cc
index f9d52b62..33a6e751 100644
--- a/lib/sbuild/chroot/facet/unshare.cc
+++ b/lib/sbuild/chroot/facet/unshare.cc
@@ -192,8 +192,7 @@ namespace sbuild
       }
 
       void
-      unshare::setup_env (chroot const& chroot,
-                          environment&  env) const
+      unshare::setup_env (environment& env) const
       {
         env.add("UNSHARE_NET", get_unshare_net());
         env.add("UNSHARE_SYSVIPC", get_unshare_sysvipc());
@@ -202,8 +201,7 @@ namespace sbuild
       }
 
       void
-      unshare::get_details (chroot const&  chroot,
-                            format_detail& detail) const
+      unshare::get_details (format_detail& detail) const
       {
         detail.add(_("Unshare Networking"), get_unshare_net());
         detail.add(_("Unshare System V IPC"), get_unshare_sysvipc());
@@ -221,34 +219,32 @@ namespace sbuild
       }
 
       void
-      unshare::get_keyfile (chroot const& chroot,
-                            keyfile&      keyfile) const
+      unshare::get_keyfile (keyfile& keyfile) const
       {
         keyfile::set_object_value(*this, &unshare::get_unshare_net,
-                                  keyfile, chroot.get_name(), "unshare.net");
+                                  keyfile, owner->get_name(), "unshare.net");
         keyfile::set_object_value(*this, &unshare::get_unshare_sysvipc,
-                                  keyfile, chroot.get_name(), "unshare.sysvipc");
+                                  keyfile, owner->get_name(), "unshare.sysvipc");
         keyfile::set_object_value(*this, &unshare::get_unshare_sysvsem,
-                                  keyfile, chroot.get_name(), "unshare.sysvsem");
+                                  keyfile, owner->get_name(), "unshare.sysvsem");
         keyfile::set_object_value(*this, &unshare::get_unshare_uts,
-                                  keyfile, chroot.get_name(), "unshare.uts");
+                                  keyfile, owner->get_name(), "unshare.uts");
       }
 
       void
-      unshare::set_keyfile (chroot&        chroot,
-                            keyfile const& keyfile)
+      unshare::set_keyfile (keyfile const& keyfile)
       {
         keyfile::get_object_value(*this, &unshare::set_unshare_net,
-                                  keyfile, chroot.get_name(), "unshare.net",
+                                  keyfile, owner->get_name(), "unshare.net",
                                   keyfile::PRIORITY_OPTIONAL);
         keyfile::get_object_value(*this, &unshare::set_unshare_sysvipc,
-                                  keyfile, chroot.get_name(), "unshare.sysvipc",
+                                  keyfile, owner->get_name(), "unshare.sysvipc",
                                   keyfile::PRIORITY_OPTIONAL);
         keyfile::get_object_value(*this, &unshare::set_unshare_sysvsem,
-                                  keyfile, chroot.get_name(), "unshare.sysvsem",
+                                  keyfile, owner->get_name(), "unshare.sysvsem",
                                   keyfile::PRIORITY_OPTIONAL);
         keyfile::get_object_value(*this, &unshare::set_unshare_uts,
-                                  keyfile, chroot.get_name(), "unshare.uts",
+                                  keyfile, owner->get_name(), "unshare.uts",
                                   keyfile::PRIORITY_OPTIONAL);
       }
 
diff --git a/lib/sbuild/chroot/facet/unshare.h b/lib/sbuild/chroot/facet/unshare.h
index 4c75be6a..08a62d70 100644
--- a/lib/sbuild/chroot/facet/unshare.h
+++ b/lib/sbuild/chroot/facet/unshare.h
@@ -142,23 +142,19 @@ namespace sbuild
         do_unshare () const;
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
       private:
         /// Unshare networking.
diff --git a/lib/sbuild/chroot/facet/userdata.cc b/lib/sbuild/chroot/facet/userdata.cc
index 068fa28f..9af16eb9 100644
--- a/lib/sbuild/chroot/facet/userdata.cc
+++ b/lib/sbuild/chroot/facet/userdata.cc
@@ -141,8 +141,7 @@ namespace sbuild
       }
 
       void
-      userdata::setup_env (chroot const& chroot,
-                           environment&  env) const
+      userdata::setup_env (environment& env) const
       {
         for (const auto& item : data)
           {
@@ -162,8 +161,7 @@ namespace sbuild
       }
 
       void
-      userdata::get_details (chroot const&  chroot,
-                             format_detail& detail) const
+      userdata::get_details (format_detail& detail) const
       {
         string_list userkeys(this->user_modifiable_keys.begin(),
                              this->user_modifiable_keys.end());
@@ -356,40 +354,38 @@ namespace sbuild
       }
 
       void
-      userdata::get_keyfile (chroot const& chroot,
-                             keyfile&      keyfile) const
+      userdata::get_keyfile (keyfile& keyfile) const
       {
         keyfile::set_object_set_value(*this,
                                       &userdata::get_user_modifiable_keys,
-                                      keyfile, chroot.get_name(),
+                                      keyfile, owner->get_name(),
                                       "user-modifiable-keys");
 
         keyfile::set_object_set_value(*this,
                                       &userdata::get_root_modifiable_keys,
-                                      keyfile, chroot.get_name(),
+                                      keyfile, owner->get_name(),
                                       "root-modifiable-keys");
 
         for (const auto& item : data)
           {
-            keyfile.set_value(chroot.get_name(),
+            keyfile.set_value(owner->get_name(),
                               item.first,
                               item.second);
           }
       }
 
       void
-      userdata::set_keyfile (chroot&        chroot,
-                             keyfile const& keyfile)
+      userdata::set_keyfile (keyfile const& keyfile)
       {
         keyfile::get_object_set_value(*this,
                                       &userdata::set_user_modifiable_keys,
-                                      keyfile, chroot.get_name(),
+                                      keyfile, owner->get_name(),
                                       "user-modifiable-keys",
                                       keyfile::PRIORITY_OPTIONAL);
 
         keyfile::get_object_set_value(*this,
                                       &userdata::set_root_modifiable_keys,
-                                      keyfile, chroot.get_name(),
+                                      keyfile, owner->get_name(),
                                       "root-modifiable-keys",
                                       keyfile::PRIORITY_OPTIONAL);
 
@@ -398,8 +394,8 @@ namespace sbuild
         // separated with one or more periods.  These may be later
         // overridden by the user on the commandline.
         {
-          string_list used_keys = chroot.get_used_keys();
-          std::string const& group = chroot.get_name();
+          string_list used_keys = owner->get_used_keys();
+          std::string const& group = owner->get_name();
           const string_list total(keyfile.get_keys(group));
 
           const string_set a(total.begin(), total.end());
diff --git a/lib/sbuild/chroot/facet/userdata.h b/lib/sbuild/chroot/facet/userdata.h
index 6c65f609..56a2c9f4 100644
--- a/lib/sbuild/chroot/facet/userdata.h
+++ b/lib/sbuild/chroot/facet/userdata.h
@@ -81,23 +81,19 @@ namespace sbuild
         get_name () const;
 
         virtual void
-        setup_env (chroot const& chroot,
-                   environment&  env) const;
+        setup_env (environment& env) const;
 
         virtual void
-        get_details (chroot const&  chroot,
-                     format_detail& detail) const;
+        get_details (format_detail& detail) const;
 
         virtual void
         get_used_keys (string_list& used_keys) const;
 
         virtual void
-        get_keyfile (chroot const& chroot,
-                     keyfile&      keyfile) const;
+        get_keyfile (keyfile& keyfile) const;
 
         virtual void
-        set_keyfile (chroot&        chroot,
-                     keyfile const& keyfile);
+        set_keyfile (keyfile const& keyfile);
 
 
         template <typename T>