diff --git a/libtransmission/observable.h b/libtransmission/observable.h
index c172604ac..be08072b8 100644
--- a/libtransmission/observable.h
+++ b/libtransmission/observable.h
@@ -104,7 +104,7 @@ private:
     }
 
     static auto inline next_key_ = Key{ 1U };
-    small::map<Key, Observer, 64U> observers_;
+    small::map<Key, Observer, 4U> observers_;
 };
 
 } // namespace libtransmission
diff --git a/libtransmission/torrent-magnet.cc b/libtransmission/torrent-magnet.cc
index ee15471ce..e7955121a 100644
--- a/libtransmission/torrent-magnet.cc
+++ b/libtransmission/torrent-magnet.cc
@@ -32,7 +32,7 @@ namespace
 // don't ask for the same metadata piece more than this often
 auto constexpr MinRepeatIntervalSecs = int{ 3 };
 
-auto create_all_needed(int n_pieces)
+[[nodiscard]] auto create_all_needed(int n_pieces)
 {
     auto ret = std::deque<tr_incomplete_metadata::metadata_node>{};
 
@@ -72,13 +72,12 @@ bool tr_torrentSetMetadataSizeHint(tr_torrent* tor, int64_t size)
         return false;
     }
 
-    auto m = tr_incomplete_metadata{};
+    auto m = std::make_unique<tr_incomplete_metadata>();
+    m->piece_count = n;
+    m->metadata.resize(size);
+    m->pieces_needed = create_all_needed(n);
 
-    m.piece_count = n;
-    m.metadata.resize(size);
-    m.pieces_needed = create_all_needed(n);
-
-    if (std::empty(m.metadata) || std::empty(m.pieces_needed))
+    if (std::empty(m->metadata) || std::empty(m->pieces_needed))
     {
         return false;
     }
diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h
index 602057d0e..fee9d9cbc 100644
--- a/libtransmission/torrent.h
+++ b/libtransmission/torrent.h
@@ -11,6 +11,7 @@
 
 #include <cstddef> // size_t
 #include <ctime>
+#include <memory>
 #include <optional>
 #include <string>
 #include <string_view>
@@ -79,8 +80,6 @@ enum tr_verify_state : uint8_t
     TR_VERIFY_NOW
 };
 
-struct tr_incomplete_metadata;
-
 /** @brief Torrent object */
 struct tr_torrent final : public tr_completion::torrent_view
 {
@@ -916,8 +915,8 @@ public:
     tr_bitfield checked_pieces_ = tr_bitfield{ 0 };
 
     tr_file_piece_map fpm_ = tr_file_piece_map{ metainfo_ };
-    tr_file_priorities file_priorities_{ &fpm_ };
     tr_files_wanted files_wanted_{ &fpm_ };
+    tr_file_priorities file_priorities_{ &fpm_ };
 
     std::string error_string;
 
@@ -927,19 +926,32 @@ public:
     // when Transmission thinks the torrent's files were last changed
     std::vector<time_t> file_mtimes_;
 
+    tr_interned_string error_announce_url;
+
+    // Where the files are when the torrent is complete.
+    tr_interned_string download_dir_;
+
+    // Where the files are when the torrent is incomplete.
+    // a value of TR_KEY_NONE indicates the 'incomplete_dir' feature is unused
+    tr_interned_string incomplete_dir_;
+
+    // Where the files are now.
+    // Will equal either download_dir or incomplete_dir
+    tr_interned_string current_dir_;
+
     tr_sha1_digest_t obfuscated_hash = {};
 
+    /* Used when the torrent has been created with a magnet link
+     * and we're in the process of downloading the metainfo from
+     * other peers */
+    std::unique_ptr<tr_incomplete_metadata> incomplete_metadata;
+
     tr_session* session = nullptr;
 
     tr_torrent_announcer* torrent_announcer = nullptr;
 
     tr_swarm* swarm = nullptr;
 
-    /* Used when the torrent has been created with a magnet link
-     * and we're in the process of downloading the metainfo from
-     * other peers */
-    std::optional<tr_incomplete_metadata> incomplete_metadata;
-
     time_t lpdAnnounceAt = 0;
 
     time_t activityDate = 0;
@@ -959,25 +971,12 @@ public:
     uint64_t corruptCur = 0;
     uint64_t corruptPrev = 0;
 
-    tr_interned_string error_announce_url;
-
-    // Where the files are when the torrent is complete.
-    tr_interned_string download_dir_;
-
-    // Where the files are when the torrent is incomplete.
-    // a value of TR_KEY_NONE indicates the 'incomplete_dir' feature is unused
-    tr_interned_string incomplete_dir_;
-
-    // Where the files are now.
-    // Will equal either download_dir or incomplete_dir
-    tr_interned_string current_dir_;
-
-    tr_stat_errtype error = TR_STAT_OK;
-
     size_t queuePosition = 0;
 
     tr_torrent_id_t unique_id_ = 0;
 
+    tr_stat_errtype error = TR_STAT_OK;
+
     tr_completeness completeness = TR_LEECH;
 
     uint16_t max_connected_peers_ = TR_DEFAULT_PEER_LIMIT_TORRENT;
@@ -1095,6 +1094,8 @@ private:
         }
     }
 
+    tr_interned_string bandwidth_group_;
+
     SimpleSmoothedSpeed eta_speed_;
 
     /* If the initiator of the connection receives a handshake in which the
@@ -1106,21 +1107,19 @@ private:
      */
     tr_peer_id_t peer_id_ = tr_peerIdInit();
 
-    tr_verify_state verify_state_ = TR_VERIFY_NONE;
-
     float verify_progress_ = -1.0F;
     float seed_ratio_ = 0.0F;
 
-    uint16_t idle_limit_minutes_ = 0;
-
     tr_announce_key_t announce_key_ = tr_rand_obj<tr_announce_key_t>();
 
-    tr_interned_string bandwidth_group_;
-
     tr_ratiolimit seed_ratio_mode_ = TR_RATIOLIMIT_GLOBAL;
 
     tr_idlelimit idle_limit_mode_ = TR_IDLELIMIT_GLOBAL;
 
+    tr_verify_state verify_state_ = TR_VERIFY_NONE;
+
+    uint16_t idle_limit_minutes_ = 0;
+
     bool needs_completeness_check_ = true;
 
     bool sequential_download_ = false;