diff --git a/include/ircd/spirit/expr.h b/include/ircd/spirit/expr.h
index bea992b33..a4c8dbdb6 100644
--- a/include/ircd/spirit/expr.h
+++ b/include/ircd/spirit/expr.h
@@ -14,7 +14,7 @@
 namespace ircd::spirit
 {
 	template<class T>
-	struct [[gnu::nodebug]] expr;
+	struct [[clang::nodebug]] expr;
 }
 
 /// Expression storage wrapper. This could also be called `named_expression`.
diff --git a/matrix/homeserver_bootstrap.cc b/matrix/homeserver_bootstrap.cc
index 326e1f4d4..041da2cd3 100644
--- a/matrix/homeserver_bootstrap.cc
+++ b/matrix/homeserver_bootstrap.cc
@@ -193,27 +193,22 @@ try
 		has(string_view(ircd::diagnostic), "valid-json")
 	};
 
-	const fs::fd file
+	const fs::fd::opts file_opts
 	{
-		path, fs::fd::opts
-		{
-			.mode = std::ios::in
-		},
+		.mode = std::ios::in,
+		.sequential = true,
 	};
 
+	const fs::fd file
+	{
+		path, file_opts
+	};
+
+	fs::map::opts map_opts{file_opts};
+	map_opts.huge2mb = true;
 	const fs::map map
 	{
-		file, fs::map::opts
-		{
-			fs::fd::opts
-			{
-				.mode = std::ios::in,
-				.sequential = true,
-			},
-
-			.huge2mb = true,
-			.huge1gb = true,
-		},
+		file, map_opts
 	};
 
 	// This array is backed by the mmap
diff --git a/modules/console.cc b/modules/console.cc
index f45cd0116..948d419f4 100644
--- a/modules/console.cc
+++ b/modules/console.cc
@@ -14817,14 +14817,10 @@ console_cmd__fed__hierarchy(opt &out, const string_view &line)
 
 	m::fed::hierarchy::opts opts
 	{
-		m::fed::request::opts
-		{
-			.remote = remote
-		},
-
 		.suggested_only = has(param["op"], "suggested"),
 	};
 
+	opts.remote = remote;
 	m::fed::hierarchy request
 	{
 		room_id, buf, std::move(opts)
@@ -14833,7 +14829,7 @@ console_cmd__fed__hierarchy(opt &out, const string_view &line)
 	request.wait(out.timeout);
 	request.get();
 
-	const json::object &response
+	const json::object response
 	{
 		request
 	};
@@ -15007,14 +15003,10 @@ console_cmd__fed__head(opt &out, const string_view &line)
 
 	m::fed::make_join::opts opts
 	{
-		m::fed::request::opts
-		{
-			.remote = remote
-		},
-
 		.knock = param["knock"] == "knock",
 	};
 
+	opts.remote = remote;
 	m::fed::make_join request
 	{
 		room_id, user_id, buf, std::move(opts)