diff --git a/include/ircd/m/dbs/room_events.h b/include/ircd/m/dbs/room_events.h
index da52b03ad..1d67badb2 100644
--- a/include/ircd/m/dbs/room_events.h
+++ b/include/ircd/m/dbs/room_events.h
@@ -20,7 +20,7 @@ namespace ircd::m::dbs
 
 	string_view room_events_key(const mutable_buffer &out, const id::room &, const uint64_t &depth, const event::idx &);
 	string_view room_events_key(const mutable_buffer &out, const id::room &, const uint64_t &depth);
-	std::pair<uint64_t, event::idx> room_events_key(const string_view &amalgam);
+	std::tuple<uint64_t, event::idx> room_events_key(const string_view &amalgam);
 
 	// room_id | depth, event_idx => node_id
 	extern db::domain room_events;
diff --git a/include/ircd/m/dbs/room_joined.h b/include/ircd/m/dbs/room_joined.h
index 5de3c2a56..88692c455 100644
--- a/include/ircd/m/dbs/room_joined.h
+++ b/include/ircd/m/dbs/room_joined.h
@@ -20,7 +20,7 @@ namespace ircd::m::dbs
 
 	string_view room_joined_key(const mutable_buffer &out, const id::room &, const string_view &origin, const id::user &member);
 	string_view room_joined_key(const mutable_buffer &out, const id::room &, const string_view &origin);
-	std::pair<string_view, string_view> room_joined_key(const string_view &amalgam);
+	std::tuple<string_view, string_view> room_joined_key(const string_view &amalgam);
 
 	// room_id | origin, member => event_idx
 	extern db::domain room_joined;
diff --git a/include/ircd/m/dbs/room_state.h b/include/ircd/m/dbs/room_state.h
index e08abdb5e..046930b03 100644
--- a/include/ircd/m/dbs/room_state.h
+++ b/include/ircd/m/dbs/room_state.h
@@ -20,7 +20,7 @@ namespace ircd::m::dbs
 
 	string_view room_state_key(const mutable_buffer &out, const id::room &, const string_view &type, const string_view &state_key);
 	string_view room_state_key(const mutable_buffer &out, const id::room &, const string_view &type);
-	std::pair<string_view, string_view> room_state_key(const string_view &amalgam);
+	std::tuple<string_view, string_view> room_state_key(const string_view &amalgam);
 
 	// room_id | type, state_key => event_idx
 	extern db::domain room_state;
diff --git a/matrix/dbs.cc b/matrix/dbs.cc
index 473faeb9d..7145ff79b 100644
--- a/matrix/dbs.cc
+++ b/matrix/dbs.cc
@@ -2994,7 +2994,7 @@ ircd::m::dbs::desc::events__room_events__cmp
 			return false;
 
 		// Distill out the depth and event_idx integers
-		const std::pair<uint64_t, event::idx> pair[2]
+		const std::tuple<uint64_t, event::idx> pair[2]
 		{
 			room_events_key(post[0]),
 			room_events_key(post[1])
@@ -3056,7 +3056,7 @@ ircd::m::dbs::room_events_key(const mutable_buffer &out_,
 	return { data(out_), data(out) };
 }
 
-std::pair<uint64_t, ircd::m::event::idx>
+std::tuple<uint64_t, ircd::m::event::idx>
 ircd::m::dbs::room_events_key(const string_view &amalgam)
 {
 	assert(size(amalgam) >= 1 + 8 + 8 || size(amalgam) == 1 + 8);
@@ -3242,7 +3242,7 @@ ircd::m::dbs::room_joined_key(const mutable_buffer &out_,
 	return { data(out_), data(out) };
 }
 
-std::pair<ircd::string_view, ircd::string_view>
+std::tuple<ircd::string_view, ircd::string_view>
 ircd::m::dbs::room_joined_key(const string_view &amalgam)
 {
 	const auto &key
@@ -3418,7 +3418,7 @@ ircd::m::dbs::room_state_key(const mutable_buffer &out_,
 	return { data(out_), data(out) };
 }
 
-std::pair<ircd::string_view, ircd::string_view>
+std::tuple<ircd::string_view, ircd::string_view>
 ircd::m::dbs::room_state_key(const string_view &amalgam)
 {
 	const auto &key