Regenerate CS API files upon the previous commit

52 files changed, 265 insertions, 420 deletions

diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp
index 80deb8f1..09fc8d40 100644
--- a/lib/csapi/account-data.cpp
+++ b/lib/csapi/account-data.cpp
@@ -4,15 +4,13 @@
 
 #include "account-data.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type,
                                      const QJsonObject& content)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetAccountDataJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/account_data/" % type)
+              makePath("/_matrix/client/r0", "/user/", userId, "/account_data/",
+                       type))
 {
     setRequestData(RequestData(toJson(content)));
 }
@@ -21,14 +19,14 @@ QUrl GetAccountDataJob::makeRequestUrl(QUrl baseUrl, const QString& userId,
                                        const QString& type)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0") % "/user/"
-                                       % userId % "/account_data/" % type);
+                                   makePath("/_matrix/client/r0", "/user/",
+                                            userId, "/account_data/", type));
 }
 
 GetAccountDataJob::GetAccountDataJob(const QString& userId, const QString& type)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetAccountDataJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/account_data/" % type)
+              makePath("/_matrix/client/r0", "/user/", userId, "/account_data/",
+                       type))
 {}
 
 SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId,
@@ -36,8 +34,8 @@ SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId,
                                                    const QString& type,
                                                    const QJsonObject& content)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetAccountDataPerRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/rooms/" % roomId % "/account_data/" % type)
+              makePath("/_matrix/client/r0", "/user/", userId, "/rooms/",
+                       roomId, "/account_data/", type))
 {
     setRequestData(RequestData(toJson(content)));
 }
@@ -48,15 +46,15 @@ QUrl GetAccountDataPerRoomJob::makeRequestUrl(QUrl baseUrl,
                                               const QString& type)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/user/" % userId % "/rooms/" % roomId
-                                       % "/account_data/" % type);
+                                   makePath("/_matrix/client/r0", "/user/",
+                                            userId, "/rooms/", roomId,
+                                            "/account_data/", type));
 }
 
 GetAccountDataPerRoomJob::GetAccountDataPerRoomJob(const QString& userId,
                                                    const QString& roomId,
                                                    const QString& type)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetAccountDataPerRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/rooms/" % roomId % "/account_data/" % type)
+              makePath("/_matrix/client/r0", "/user/", userId, "/rooms/",
+                       roomId, "/account_data/", type))
 {}
diff --git a/lib/csapi/admin.cpp b/lib/csapi/admin.cpp
index 9619c441..81dd0624 100644
--- a/lib/csapi/admin.cpp
+++ b/lib/csapi/admin.cpp
@@ -4,18 +4,16 @@
 
 #include "admin.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetWhoIsJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/admin/whois/" % userId);
+                                   makePath("/_matrix/client/r0",
+                                            "/admin/whois/", userId));
 }
 
 GetWhoIsJob::GetWhoIsJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetWhoIsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/admin/whois/" % userId)
+              makePath("/_matrix/client/r0", "/admin/whois/", userId))
 {}
diff --git a/lib/csapi/administrative_contact.cpp b/lib/csapi/administrative_contact.cpp
index 04360299..589c9fc1 100644
--- a/lib/csapi/administrative_contact.cpp
+++ b/lib/csapi/administrative_contact.cpp
@@ -4,25 +4,22 @@
 
 #include "administrative_contact.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetAccount3PIDsJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/account/3pid");
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl), makePath("/_matrix/client/r0", "/account/3pid"));
 }
 
 GetAccount3PIDsJob::GetAccount3PIDsJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetAccount3PIDsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid")
+              makePath("/_matrix/client/r0", "/account/3pid"))
 {}
 
 Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds)
     : BaseJob(HttpVerb::Post, QStringLiteral("Post3PIDsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid")
+              makePath("/_matrix/client/r0", "/account/3pid"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("three_pid_creds"), threePidCreds);
@@ -32,7 +29,7 @@ Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds)
 Add3PIDJob::Add3PIDJob(const QString& clientSecret, const QString& sid,
                        const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("Add3PIDJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid/add")
+              makePath("/_matrix/client/r0", "/account/3pid/add"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
@@ -44,7 +41,7 @@ Add3PIDJob::Add3PIDJob(const QString& clientSecret, const QString& sid,
 Bind3PIDJob::Bind3PIDJob(const QString& clientSecret, const QString& idServer,
                          const QString& idAccessToken, const QString& sid)
     : BaseJob(HttpVerb::Post, QStringLiteral("Bind3PIDJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid/bind")
+              makePath("/_matrix/client/r0", "/account/3pid/bind"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("client_secret"), clientSecret);
@@ -58,7 +55,7 @@ Delete3pidFromAccountJob::Delete3pidFromAccountJob(const QString& medium,
                                                    const QString& address,
                                                    const QString& idServer)
     : BaseJob(HttpVerb::Post, QStringLiteral("Delete3pidFromAccountJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid/delete")
+              makePath("/_matrix/client/r0", "/account/3pid/delete"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("id_server"), idServer);
@@ -72,7 +69,7 @@ Unbind3pidFromAccountJob::Unbind3pidFromAccountJob(const QString& medium,
                                                    const QString& address,
                                                    const QString& idServer)
     : BaseJob(HttpVerb::Post, QStringLiteral("Unbind3pidFromAccountJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/3pid/unbind")
+              makePath("/_matrix/client/r0", "/account/3pid/unbind"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("id_server"), idServer);
@@ -85,8 +82,8 @@ Unbind3pidFromAccountJob::Unbind3pidFromAccountJob(const QString& medium,
 RequestTokenTo3PIDEmailJob::RequestTokenTo3PIDEmailJob(
     const EmailValidationData& body)
     : BaseJob(HttpVerb::Post, QStringLiteral("RequestTokenTo3PIDEmailJob"),
-              QStringLiteral("/_matrix/client/r0")
-                  % "/account/3pid/email/requestToken",
+              makePath("/_matrix/client/r0",
+                       "/account/3pid/email/requestToken"),
               false)
 {
     setRequestData(RequestData(toJson(body)));
@@ -95,8 +92,8 @@ RequestTokenTo3PIDEmailJob::RequestTokenTo3PIDEmailJob(
 RequestTokenTo3PIDMSISDNJob::RequestTokenTo3PIDMSISDNJob(
     const MsisdnValidationData& body)
     : BaseJob(HttpVerb::Post, QStringLiteral("RequestTokenTo3PIDMSISDNJob"),
-              QStringLiteral("/_matrix/client/r0")
-                  % "/account/3pid/msisdn/requestToken",
+              makePath("/_matrix/client/r0",
+                       "/account/3pid/msisdn/requestToken"),
               false)
 {
     setRequestData(RequestData(toJson(body)));
diff --git a/lib/csapi/appservice_room_directory.cpp b/lib/csapi/appservice_room_directory.cpp
index 4d87e4af..40d784c6 100644
--- a/lib/csapi/appservice_room_directory.cpp
+++ b/lib/csapi/appservice_room_directory.cpp
@@ -4,16 +4,14 @@
 
 #include "appservice_room_directory.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 UpdateAppserviceRoomDirectoryVisibilityJob::UpdateAppserviceRoomDirectoryVisibilityJob(
     const QString& networkId, const QString& roomId, const QString& visibility)
     : BaseJob(HttpVerb::Put,
               QStringLiteral("UpdateAppserviceRoomDirectoryVisibilityJob"),
-              QStringLiteral("/_matrix/client/r0")
-                  % "/directory/list/appservice/" % networkId % "/" % roomId)
+              makePath("/_matrix/client/r0", "/directory/list/appservice/",
+                       networkId, "/", roomId))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("visibility"), visibility);
diff --git a/lib/csapi/banning.cpp b/lib/csapi/banning.cpp
index 8e0add1a..472128bb 100644
--- a/lib/csapi/banning.cpp
+++ b/lib/csapi/banning.cpp
@@ -4,14 +4,12 @@
 
 #include "banning.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 BanJob::BanJob(const QString& roomId, const QString& userId,
                const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("BanJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/ban")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/ban"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
@@ -22,8 +20,7 @@ BanJob::BanJob(const QString& roomId, const QString& userId,
 UnbanJob::UnbanJob(const QString& roomId, const QString& userId,
                    const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("UnbanJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/unban")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/unban"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
diff --git a/lib/csapi/capabilities.cpp b/lib/csapi/capabilities.cpp
index 33a53cad..bc21e462 100644
--- a/lib/csapi/capabilities.cpp
+++ b/lib/csapi/capabilities.cpp
@@ -4,20 +4,17 @@
 
 #include "capabilities.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetCapabilitiesJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/capabilities");
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl), makePath("/_matrix/client/r0", "/capabilities"));
 }
 
 GetCapabilitiesJob::GetCapabilitiesJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetCapabilitiesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/capabilities")
+              makePath("/_matrix/client/r0", "/capabilities"))
 {
     addExpectedKey("capabilities");
 }
diff --git a/lib/csapi/content-repo.cpp b/lib/csapi/content-repo.cpp
index 2d82437b..6d1e38b6 100644
--- a/lib/csapi/content-repo.cpp
+++ b/lib/csapi/content-repo.cpp
@@ -4,8 +4,6 @@
 
 #include "content-repo.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToUploadContent(const QString& filename)
@@ -18,7 +16,7 @@ auto queryToUploadContent(const QString& filename)
 UploadContentJob::UploadContentJob(QIODevice* content, const QString& filename,
                                    const QString& contentType)
     : BaseJob(HttpVerb::Post, QStringLiteral("UploadContentJob"),
-              QStringLiteral("/_matrix/media/r0") % "/upload",
+              makePath("/_matrix/media/r0", "/upload"),
               queryToUploadContent(filename))
 {
     setRequestHeader("Content-Type", contentType.toLatin1());
@@ -37,17 +35,16 @@ QUrl GetContentJob::makeRequestUrl(QUrl baseUrl, const QString& serverName,
                                    const QString& mediaId, bool allowRemote)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/media/r0")
-                                       % "/download/" % serverName % "/"
-                                       % mediaId,
+                                   makePath("/_matrix/media/r0", "/download/",
+                                            serverName, "/", mediaId),
                                    queryToGetContent(allowRemote));
 }
 
 GetContentJob::GetContentJob(const QString& serverName, const QString& mediaId,
                              bool allowRemote)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetContentJob"),
-              QStringLiteral("/_matrix/media/r0") % "/download/" % serverName
-                  % "/" % mediaId,
+              makePath("/_matrix/media/r0", "/download/", serverName, "/",
+                       mediaId),
               queryToGetContent(allowRemote), {}, false)
 {
     setExpectedContentTypes({ "*/*" });
@@ -67,9 +64,9 @@ QUrl GetContentOverrideNameJob::makeRequestUrl(QUrl baseUrl,
                                                bool allowRemote)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/media/r0")
-                                       % "/download/" % serverName % "/"
-                                       % mediaId % "/" % fileName,
+                                   makePath("/_matrix/media/r0", "/download/",
+                                            serverName, "/", mediaId, "/",
+                                            fileName),
                                    queryToGetContentOverrideName(allowRemote));
 }
 
@@ -78,8 +75,8 @@ GetContentOverrideNameJob::GetContentOverrideNameJob(const QString& serverName,
                                                      const QString& fileName,
                                                      bool allowRemote)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetContentOverrideNameJob"),
-              QStringLiteral("/_matrix/media/r0") % "/download/" % serverName
-                  % "/" % mediaId % "/" % fileName,
+              makePath("/_matrix/media/r0", "/download/", serverName, "/",
+                       mediaId, "/", fileName),
               queryToGetContentOverrideName(allowRemote), {}, false)
 {
     setExpectedContentTypes({ "*/*" });
@@ -104,8 +101,7 @@ QUrl GetContentThumbnailJob::makeRequestUrl(QUrl baseUrl,
 {
     return BaseJob::makeRequestUrl(
         std::move(baseUrl),
-        QStringLiteral("/_matrix/media/r0") % "/thumbnail/" % serverName % "/"
-            % mediaId,
+        makePath("/_matrix/media/r0", "/thumbnail/", serverName, "/", mediaId),
         queryToGetContentThumbnail(width, height, method, allowRemote));
 }
 
@@ -114,8 +110,8 @@ GetContentThumbnailJob::GetContentThumbnailJob(const QString& serverName,
                                                int height, const QString& method,
                                                bool allowRemote)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetContentThumbnailJob"),
-              QStringLiteral("/_matrix/media/r0") % "/thumbnail/" % serverName
-                  % "/" % mediaId,
+              makePath("/_matrix/media/r0", "/thumbnail/", serverName, "/",
+                       mediaId),
               queryToGetContentThumbnail(width, height, method, allowRemote),
               {}, false)
 {
@@ -134,25 +130,24 @@ QUrl GetUrlPreviewJob::makeRequestUrl(QUrl baseUrl, const QUrl& url,
                                       Omittable<qint64> ts)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/media/r0")
-                                       % "/preview_url",
+                                   makePath("/_matrix/media/r0",
+                                            "/preview_url"),
                                    queryToGetUrlPreview(url, ts));
 }
 
 GetUrlPreviewJob::GetUrlPreviewJob(const QUrl& url, Omittable<qint64> ts)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetUrlPreviewJob"),
-              QStringLiteral("/_matrix/media/r0") % "/preview_url",
+              makePath("/_matrix/media/r0", "/preview_url"),
               queryToGetUrlPreview(url, ts))
 {}
 
 QUrl GetConfigJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/media/r0")
-                                       % "/config");
+                                   makePath("/_matrix/media/r0", "/config"));
 }
 
 GetConfigJob::GetConfigJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetConfigJob"),
-              QStringLiteral("/_matrix/media/r0") % "/config")
+              makePath("/_matrix/media/r0", "/config"))
 {}
diff --git a/lib/csapi/create_room.cpp b/lib/csapi/create_room.cpp
index a94f9951..9aaef87f 100644
--- a/lib/csapi/create_room.cpp
+++ b/lib/csapi/create_room.cpp
@@ -4,8 +4,6 @@
 
 #include "create_room.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 CreateRoomJob::CreateRoomJob(const QString& visibility,
@@ -18,7 +16,7 @@ CreateRoomJob::CreateRoomJob(const QString& visibility,
                              const QString& preset, Omittable<bool> isDirect,
                              const QJsonObject& powerLevelContentOverride)
     : BaseJob(HttpVerb::Post, QStringLiteral("CreateRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/createRoom")
+              makePath("/_matrix/client/r0", "/createRoom"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("visibility"), visibility);
diff --git a/lib/csapi/cross_signing.cpp b/lib/csapi/cross_signing.cpp
index ed2b15c0..1fa0e949 100644
--- a/lib/csapi/cross_signing.cpp
+++ b/lib/csapi/cross_signing.cpp
@@ -4,8 +4,6 @@
 
 #include "cross_signing.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 UploadCrossSigningKeysJob::UploadCrossSigningKeysJob(
@@ -13,8 +11,7 @@ UploadCrossSigningKeysJob::UploadCrossSigningKeysJob(
     const Omittable<CrossSigningKey>& selfSigningKey,
     const Omittable<CrossSigningKey>& userSigningKey)
     : BaseJob(HttpVerb::Post, QStringLiteral("UploadCrossSigningKeysJob"),
-              QStringLiteral("/_matrix/client/r0")
-                  % "/keys/device_signing/upload")
+              makePath("/_matrix/client/r0", "/keys/device_signing/upload"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("master_key"), masterKey);
@@ -28,7 +25,7 @@ UploadCrossSigningKeysJob::UploadCrossSigningKeysJob(
 UploadCrossSigningSignaturesJob::UploadCrossSigningSignaturesJob(
     const QHash<QString, QHash<QString, QJsonObject>>& signatures)
     : BaseJob(HttpVerb::Post, QStringLiteral("UploadCrossSigningSignaturesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/keys/signatures/upload")
+              makePath("/_matrix/client/r0", "/keys/signatures/upload"))
 {
     setRequestData(RequestData(toJson(signatures)));
 }
diff --git a/lib/csapi/device_management.cpp b/lib/csapi/device_management.cpp
index eac9a545..da6dbc76 100644
--- a/lib/csapi/device_management.cpp
+++ b/lib/csapi/device_management.cpp
@@ -4,38 +4,35 @@
 
 #include "device_management.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetDevicesJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/devices");
+                                   makePath("/_matrix/client/r0", "/devices"));
 }
 
 GetDevicesJob::GetDevicesJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetDevicesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices")
+              makePath("/_matrix/client/r0", "/devices"))
 {}
 
 QUrl GetDeviceJob::makeRequestUrl(QUrl baseUrl, const QString& deviceId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/devices/" % deviceId);
+                                   makePath("/_matrix/client/r0", "/devices/",
+                                            deviceId));
 }
 
 GetDeviceJob::GetDeviceJob(const QString& deviceId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetDeviceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices/" % deviceId)
+              makePath("/_matrix/client/r0", "/devices/", deviceId))
 {}
 
 UpdateDeviceJob::UpdateDeviceJob(const QString& deviceId,
                                  const QString& displayName)
     : BaseJob(HttpVerb::Put, QStringLiteral("UpdateDeviceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices/" % deviceId)
+              makePath("/_matrix/client/r0", "/devices/", deviceId))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("display_name"), displayName);
@@ -45,7 +42,7 @@ UpdateDeviceJob::UpdateDeviceJob(const QString& deviceId,
 DeleteDeviceJob::DeleteDeviceJob(const QString& deviceId,
                                  const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/devices/" % deviceId)
+              makePath("/_matrix/client/r0", "/devices/", deviceId))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
@@ -55,7 +52,7 @@ DeleteDeviceJob::DeleteDeviceJob(const QString& deviceId,
 DeleteDevicesJob::DeleteDevicesJob(const QStringList& devices,
                                    const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("DeleteDevicesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/delete_devices")
+              makePath("/_matrix/client/r0", "/delete_devices"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("devices"), devices);
diff --git a/lib/csapi/directory.cpp b/lib/csapi/directory.cpp
index 25ea82e2..b351b4ef 100644
--- a/lib/csapi/directory.cpp
+++ b/lib/csapi/directory.cpp
@@ -4,14 +4,11 @@
 
 #include "directory.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetRoomAliasJob"),
-              QStringLiteral("/_matrix/client/r0") % "/directory/room/"
-                  % roomAlias)
+              makePath("/_matrix/client/r0", "/directory/room/", roomAlias))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("room_id"), roomId);
@@ -21,41 +18,38 @@ SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId
 QUrl GetRoomIdByAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/directory/room/" % roomAlias);
+                                   makePath("/_matrix/client/r0",
+                                            "/directory/room/", roomAlias));
 }
 
 GetRoomIdByAliasJob::GetRoomIdByAliasJob(const QString& roomAlias)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomIdByAliasJob"),
-              QStringLiteral("/_matrix/client/r0") % "/directory/room/"
-                  % roomAlias,
+              makePath("/_matrix/client/r0", "/directory/room/", roomAlias),
               false)
 {}
 
 QUrl DeleteRoomAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/directory/room/" % roomAlias);
+                                   makePath("/_matrix/client/r0",
+                                            "/directory/room/", roomAlias));
 }
 
 DeleteRoomAliasJob::DeleteRoomAliasJob(const QString& roomAlias)
     : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteRoomAliasJob"),
-              QStringLiteral("/_matrix/client/r0") % "/directory/room/"
-                  % roomAlias)
+              makePath("/_matrix/client/r0", "/directory/room/", roomAlias))
 {}
 
 QUrl GetLocalAliasesJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/aliases");
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/aliases"));
 }
 
 GetLocalAliasesJob::GetLocalAliasesJob(const QString& roomId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetLocalAliasesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/aliases")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/aliases"))
 {
     addExpectedKey("aliases");
 }
diff --git a/lib/csapi/event_context.cpp b/lib/csapi/event_context.cpp
index 3f4cd61e..877838e2 100644
--- a/lib/csapi/event_context.cpp
+++ b/lib/csapi/event_context.cpp
@@ -4,8 +4,6 @@
 
 #include "event_context.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToGetEventContext(Omittable<int> limit, const QString& filter)
@@ -22,9 +20,8 @@ QUrl GetEventContextJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
                                         const QString& filter)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/context/"
-                                       % eventId,
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/context/", eventId),
                                    queryToGetEventContext(limit, filter));
 }
 
@@ -33,7 +30,7 @@ GetEventContextJob::GetEventContextJob(const QString& roomId,
                                        Omittable<int> limit,
                                        const QString& filter)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetEventContextJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/context/" % eventId,
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/context/",
+                       eventId),
               queryToGetEventContext(limit, filter))
 {}
diff --git a/lib/csapi/filter.cpp b/lib/csapi/filter.cpp
index 6b8863cc..38c68be7 100644
--- a/lib/csapi/filter.cpp
+++ b/lib/csapi/filter.cpp
@@ -4,14 +4,11 @@
 
 #include "filter.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 DefineFilterJob::DefineFilterJob(const QString& userId, const Filter& filter)
     : BaseJob(HttpVerb::Post, QStringLiteral("DefineFilterJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/filter")
+              makePath("/_matrix/client/r0", "/user/", userId, "/filter"))
 {
     setRequestData(RequestData(toJson(filter)));
     addExpectedKey("filter_id");
@@ -21,12 +18,12 @@ QUrl GetFilterJob::makeRequestUrl(QUrl baseUrl, const QString& userId,
                                   const QString& filterId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0") % "/user/"
-                                       % userId % "/filter/" % filterId);
+                                   makePath("/_matrix/client/r0", "/user/",
+                                            userId, "/filter/", filterId));
 }
 
 GetFilterJob::GetFilterJob(const QString& userId, const QString& filterId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetFilterJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/filter/" % filterId)
+              makePath("/_matrix/client/r0", "/user/", userId, "/filter/",
+                       filterId))
 {}
diff --git a/lib/csapi/inviting.cpp b/lib/csapi/inviting.cpp
index 1e2554f4..39d24611 100644
--- a/lib/csapi/inviting.cpp
+++ b/lib/csapi/inviting.cpp
@@ -4,15 +4,12 @@
 
 #include "inviting.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 InviteUserJob::InviteUserJob(const QString& roomId, const QString& userId,
                              const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("InviteUserJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/invite")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/invite"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index f5266f0b..373c1c6a 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -4,15 +4,13 @@
 
 #include "joining.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 JoinRoomByIdJob::JoinRoomByIdJob(
     const QString& roomId, const Omittable<ThirdPartySigned>& thirdPartySigned,
     const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("JoinRoomByIdJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/join")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/join"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
@@ -34,7 +32,7 @@ JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias,
                          const Omittable<ThirdPartySigned>& thirdPartySigned,
                          const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("JoinRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/join/" % roomIdOrAlias,
+              makePath("/_matrix/client/r0", "/join/", roomIdOrAlias),
               queryToJoinRoom(serverName))
 {
     QJsonObject _data;
diff --git a/lib/csapi/keys.cpp b/lib/csapi/keys.cpp
index ba5d8e12..d6bd2fab 100644
--- a/lib/csapi/keys.cpp
+++ b/lib/csapi/keys.cpp
@@ -4,14 +4,12 @@
 
 #include "keys.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 UploadKeysJob::UploadKeysJob(const Omittable<DeviceKeys>& deviceKeys,
                              const QHash<QString, QVariant>& oneTimeKeys)
     : BaseJob(HttpVerb::Post, QStringLiteral("UploadKeysJob"),
-              QStringLiteral("/_matrix/client/r0") % "/keys/upload")
+              makePath("/_matrix/client/r0", "/keys/upload"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("device_keys"), deviceKeys);
@@ -23,7 +21,7 @@ UploadKeysJob::UploadKeysJob(const Omittable<DeviceKeys>& deviceKeys,
 QueryKeysJob::QueryKeysJob(const QHash<QString, QStringList>& deviceKeys,
                            Omittable<int> timeout, const QString& token)
     : BaseJob(HttpVerb::Post, QStringLiteral("QueryKeysJob"),
-              QStringLiteral("/_matrix/client/r0") % "/keys/query")
+              makePath("/_matrix/client/r0", "/keys/query"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
@@ -36,7 +34,7 @@ ClaimKeysJob::ClaimKeysJob(
     const QHash<QString, QHash<QString, QString>>& oneTimeKeys,
     Omittable<int> timeout)
     : BaseJob(HttpVerb::Post, QStringLiteral("ClaimKeysJob"),
-              QStringLiteral("/_matrix/client/r0") % "/keys/claim")
+              makePath("/_matrix/client/r0", "/keys/claim"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
@@ -57,13 +55,13 @@ QUrl GetKeysChangesJob::makeRequestUrl(QUrl baseUrl, const QString& from,
                                        const QString& to)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/keys/changes",
+                                   makePath("/_matrix/client/r0",
+                                            "/keys/changes"),
                                    queryToGetKeysChanges(from, to));
 }
 
 GetKeysChangesJob::GetKeysChangesJob(const QString& from, const QString& to)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetKeysChangesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/keys/changes",
+              makePath("/_matrix/client/r0", "/keys/changes"),
               queryToGetKeysChanges(from, to))
 {}
diff --git a/lib/csapi/kicking.cpp b/lib/csapi/kicking.cpp
index 7de5ce01..433e592c 100644
--- a/lib/csapi/kicking.cpp
+++ b/lib/csapi/kicking.cpp
@@ -4,14 +4,12 @@
 
 #include "kicking.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 KickJob::KickJob(const QString& roomId, const QString& userId,
                  const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("KickJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/kick")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/kick"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
diff --git a/lib/csapi/knocking.cpp b/lib/csapi/knocking.cpp
index 788bb378..73e13e6e 100644
--- a/lib/csapi/knocking.cpp
+++ b/lib/csapi/knocking.cpp
@@ -4,8 +4,6 @@
 
 #include "knocking.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToKnockRoom(const QStringList& serverName)
@@ -18,7 +16,7 @@ auto queryToKnockRoom(const QStringList& serverName)
 KnockRoomJob::KnockRoomJob(const QString& roomIdOrAlias,
                            const QStringList& serverName, const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("KnockRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/knock/" % roomIdOrAlias,
+              makePath("/_matrix/client/r0", "/knock/", roomIdOrAlias),
               queryToKnockRoom(serverName))
 {
     QJsonObject _data;
diff --git a/lib/csapi/leaving.cpp b/lib/csapi/leaving.cpp
index f4c5f120..0e5386be 100644
--- a/lib/csapi/leaving.cpp
+++ b/lib/csapi/leaving.cpp
@@ -4,14 +4,11 @@
 
 #include "leaving.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 LeaveRoomJob::LeaveRoomJob(const QString& roomId, const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("LeaveRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/leave")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/leave"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
@@ -21,12 +18,11 @@ LeaveRoomJob::LeaveRoomJob(const QString& roomId, const QString& reason)
 QUrl ForgetRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/forget");
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/forget"));
 }
 
 ForgetRoomJob::ForgetRoomJob(const QString& roomId)
     : BaseJob(HttpVerb::Post, QStringLiteral("ForgetRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/forget")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/forget"))
 {}
diff --git a/lib/csapi/list_joined_rooms.cpp b/lib/csapi/list_joined_rooms.cpp
index 8d7e267f..22ba04da 100644
--- a/lib/csapi/list_joined_rooms.cpp
+++ b/lib/csapi/list_joined_rooms.cpp
@@ -4,20 +4,17 @@
 
 #include "list_joined_rooms.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetJoinedRoomsJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/joined_rooms");
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl), makePath("/_matrix/client/r0", "/joined_rooms"));
 }
 
 GetJoinedRoomsJob::GetJoinedRoomsJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetJoinedRoomsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/joined_rooms")
+              makePath("/_matrix/client/r0", "/joined_rooms"))
 {
     addExpectedKey("joined_rooms");
 }
diff --git a/lib/csapi/list_public_rooms.cpp b/lib/csapi/list_public_rooms.cpp
index a4bcb934..25f8da5c 100644
--- a/lib/csapi/list_public_rooms.cpp
+++ b/lib/csapi/list_public_rooms.cpp
@@ -4,31 +4,27 @@
 
 #include "list_public_rooms.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetRoomVisibilityOnDirectoryJob::makeRequestUrl(QUrl baseUrl,
                                                      const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/directory/list/room/" % roomId);
+                                   makePath("/_matrix/client/r0",
+                                            "/directory/list/room/", roomId));
 }
 
 GetRoomVisibilityOnDirectoryJob::GetRoomVisibilityOnDirectoryJob(
     const QString& roomId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomVisibilityOnDirectoryJob"),
-              QStringLiteral("/_matrix/client/r0") % "/directory/list/room/"
-                  % roomId,
+              makePath("/_matrix/client/r0", "/directory/list/room/", roomId),
               false)
 {}
 
 SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(
     const QString& roomId, const QString& visibility)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetRoomVisibilityOnDirectoryJob"),
-              QStringLiteral("/_matrix/client/r0") % "/directory/list/room/"
-                  % roomId)
+              makePath("/_matrix/client/r0", "/directory/list/room/", roomId))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("visibility"), visibility);
@@ -50,15 +46,15 @@ QUrl GetPublicRoomsJob::makeRequestUrl(QUrl baseUrl, Omittable<int> limit,
                                        const QString& server)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/publicRooms",
+                                   makePath("/_matrix/client/r0",
+                                            "/publicRooms"),
                                    queryToGetPublicRooms(limit, since, server));
 }
 
 GetPublicRoomsJob::GetPublicRoomsJob(Omittable<int> limit, const QString& since,
                                      const QString& server)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPublicRoomsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/publicRooms",
+              makePath("/_matrix/client/r0", "/publicRooms"),
               queryToGetPublicRooms(limit, since, server), {}, false)
 {
     addExpectedKey("chunk");
@@ -78,7 +74,7 @@ QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server,
                                          Omittable<bool> includeAllNetworks,
                                          const QString& thirdPartyInstanceId)
     : BaseJob(HttpVerb::Post, QStringLiteral("QueryPublicRoomsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/publicRooms",
+              makePath("/_matrix/client/r0", "/publicRooms"),
               queryToQueryPublicRooms(server))
 {
     QJsonObject _data;
diff --git a/lib/csapi/login.cpp b/lib/csapi/login.cpp
index a5bac9ea..71fd93c5 100644
--- a/lib/csapi/login.cpp
+++ b/lib/csapi/login.cpp
@@ -4,20 +4,17 @@
 
 #include "login.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetLoginFlowsJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/login");
+                                   makePath("/_matrix/client/r0", "/login"));
 }
 
 GetLoginFlowsJob::GetLoginFlowsJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetLoginFlowsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/login", false)
+              makePath("/_matrix/client/r0", "/login"), false)
 {}
 
 LoginJob::LoginJob(const QString& type,
@@ -26,7 +23,7 @@ LoginJob::LoginJob(const QString& type,
                    const QString& deviceId,
                    const QString& initialDeviceDisplayName)
     : BaseJob(HttpVerb::Post, QStringLiteral("LoginJob"),
-              QStringLiteral("/_matrix/client/r0") % "/login", false)
+              makePath("/_matrix/client/r0", "/login"), false)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("type"), type);
diff --git a/lib/csapi/logout.cpp b/lib/csapi/logout.cpp
index 9583b8ec..e8083e31 100644
--- a/lib/csapi/logout.cpp
+++ b/lib/csapi/logout.cpp
@@ -4,30 +4,26 @@
 
 #include "logout.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl LogoutJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/logout");
+                                   makePath("/_matrix/client/r0", "/logout"));
 }
 
 LogoutJob::LogoutJob()
     : BaseJob(HttpVerb::Post, QStringLiteral("LogoutJob"),
-              QStringLiteral("/_matrix/client/r0") % "/logout")
+              makePath("/_matrix/client/r0", "/logout"))
 {}
 
 QUrl LogoutAllJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/logout/all");
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl), makePath("/_matrix/client/r0", "/logout/all"));
 }
 
 LogoutAllJob::LogoutAllJob()
     : BaseJob(HttpVerb::Post, QStringLiteral("LogoutAllJob"),
-              QStringLiteral("/_matrix/client/r0") % "/logout/all")
+              makePath("/_matrix/client/r0", "/logout/all"))
 {}
diff --git a/lib/csapi/message_pagination.cpp b/lib/csapi/message_pagination.cpp
index 441e4dea..1a93b75b 100644
--- a/lib/csapi/message_pagination.cpp
+++ b/lib/csapi/message_pagination.cpp
@@ -4,8 +4,6 @@
 
 #include "message_pagination.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToGetRoomEvents(const QString& from, const QString& to,
@@ -28,7 +26,7 @@ QUrl GetRoomEventsJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
 {
     return BaseJob::makeRequestUrl(
         std::move(baseUrl),
-        QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/messages",
+        makePath("/_matrix/client/r0", "/rooms/", roomId, "/messages"),
         queryToGetRoomEvents(from, to, dir, limit, filter));
 }
 
@@ -36,7 +34,6 @@ GetRoomEventsJob::GetRoomEventsJob(const QString& roomId, const QString& from,
                                    const QString& dir, const QString& to,
                                    Omittable<int> limit, const QString& filter)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomEventsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/messages",
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/messages"),
               queryToGetRoomEvents(from, to, dir, limit, filter))
 {}
diff --git a/lib/csapi/notifications.cpp b/lib/csapi/notifications.cpp
index a38e46f5..1e523c6f 100644
--- a/lib/csapi/notifications.cpp
+++ b/lib/csapi/notifications.cpp
@@ -4,8 +4,6 @@
 
 #include "notifications.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToGetNotifications(const QString& from, Omittable<int> limit,
@@ -23,8 +21,8 @@ QUrl GetNotificationsJob::makeRequestUrl(QUrl baseUrl, const QString& from,
                                          const QString& only)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/notifications",
+                                   makePath("/_matrix/client/r0",
+                                            "/notifications"),
                                    queryToGetNotifications(from, limit, only));
 }
 
@@ -32,7 +30,7 @@ GetNotificationsJob::GetNotificationsJob(const QString& from,
                                          Omittable<int> limit,
                                          const QString& only)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetNotificationsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/notifications",
+              makePath("/_matrix/client/r0", "/notifications"),
               queryToGetNotifications(from, limit, only))
 {
     addExpectedKey("notifications");
diff --git a/lib/csapi/openid.cpp b/lib/csapi/openid.cpp
index 0447db79..5c93a2d7 100644
--- a/lib/csapi/openid.cpp
+++ b/lib/csapi/openid.cpp
@@ -4,15 +4,13 @@
 
 #include "openid.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 RequestOpenIdTokenJob::RequestOpenIdTokenJob(const QString& userId,
                                              const QJsonObject& body)
     : BaseJob(HttpVerb::Post, QStringLiteral("RequestOpenIdTokenJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/openid/request_token")
+              makePath("/_matrix/client/r0", "/user/", userId,
+                       "/openid/request_token"))
 {
     setRequestData(RequestData(toJson(body)));
 }
diff --git a/lib/csapi/peeking_events.cpp b/lib/csapi/peeking_events.cpp
index ad2f9afe..eb5d22fa 100644
--- a/lib/csapi/peeking_events.cpp
+++ b/lib/csapi/peeking_events.cpp
@@ -4,8 +4,6 @@
 
 #include "peeking_events.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToPeekEvents(const QString& from, Omittable<int> timeout,
@@ -22,14 +20,13 @@ QUrl PeekEventsJob::makeRequestUrl(QUrl baseUrl, const QString& from,
                                    Omittable<int> timeout, const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/events",
+                                   makePath("/_matrix/client/r0", "/events"),
                                    queryToPeekEvents(from, timeout, roomId));
 }
 
 PeekEventsJob::PeekEventsJob(const QString& from, Omittable<int> timeout,
                              const QString& roomId)
     : BaseJob(HttpVerb::Get, QStringLiteral("PeekEventsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/events",
+              makePath("/_matrix/client/r0", "/events"),
               queryToPeekEvents(from, timeout, roomId))
 {}
diff --git a/lib/csapi/presence.cpp b/lib/csapi/presence.cpp
index 58d0d157..4f77c466 100644
--- a/lib/csapi/presence.cpp
+++ b/lib/csapi/presence.cpp
@@ -4,15 +4,12 @@
 
 #include "presence.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SetPresenceJob::SetPresenceJob(const QString& userId, const QString& presence,
                                const QString& statusMsg)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetPresenceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/presence/" % userId
-                  % "/status")
+              makePath("/_matrix/client/r0", "/presence/", userId, "/status"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("presence"), presence);
@@ -23,14 +20,13 @@ SetPresenceJob::SetPresenceJob(const QString& userId, const QString& presence,
 QUrl GetPresenceJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/presence/" % userId % "/status");
+                                   makePath("/_matrix/client/r0", "/presence/",
+                                            userId, "/status"));
 }
 
 GetPresenceJob::GetPresenceJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPresenceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/presence/" % userId
-                  % "/status")
+              makePath("/_matrix/client/r0", "/presence/", userId, "/status"))
 {
     addExpectedKey("presence");
 }
diff --git a/lib/csapi/profile.cpp b/lib/csapi/profile.cpp
index 745fa488..64ac84ca 100644
--- a/lib/csapi/profile.cpp
+++ b/lib/csapi/profile.cpp
@@ -4,15 +4,12 @@
 
 #include "profile.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SetDisplayNameJob::SetDisplayNameJob(const QString& userId,
                                      const QString& displayname)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetDisplayNameJob"),
-              QStringLiteral("/_matrix/client/r0") % "/profile/" % userId
-                  % "/displayname")
+              makePath("/_matrix/client/r0", "/profile/", userId, "/displayname"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("displayname"), displayname);
@@ -22,21 +19,19 @@ SetDisplayNameJob::SetDisplayNameJob(const QString& userId,
 QUrl GetDisplayNameJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/profile/" % userId % "/displayname");
+                                   makePath("/_matrix/client/r0", "/profile/",
+                                            userId, "/displayname"));
 }
 
 GetDisplayNameJob::GetDisplayNameJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetDisplayNameJob"),
-              QStringLiteral("/_matrix/client/r0") % "/profile/" % userId
-                  % "/displayname",
+              makePath("/_matrix/client/r0", "/profile/", userId, "/displayname"),
               false)
 {}
 
 SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QUrl& avatarUrl)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetAvatarUrlJob"),
-              QStringLiteral("/_matrix/client/r0") % "/profile/" % userId
-                  % "/avatar_url")
+              makePath("/_matrix/client/r0", "/profile/", userId, "/avatar_url"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("avatar_url"), avatarUrl);
@@ -46,25 +41,24 @@ SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QUrl& avatarUrl)
 QUrl GetAvatarUrlJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/profile/" % userId % "/avatar_url");
+                                   makePath("/_matrix/client/r0", "/profile/",
+                                            userId, "/avatar_url"));
 }
 
 GetAvatarUrlJob::GetAvatarUrlJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetAvatarUrlJob"),
-              QStringLiteral("/_matrix/client/r0") % "/profile/" % userId
-                  % "/avatar_url",
+              makePath("/_matrix/client/r0", "/profile/", userId, "/avatar_url"),
               false)
 {}
 
 QUrl GetUserProfileJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/profile/" % userId);
+                                   makePath("/_matrix/client/r0", "/profile/",
+                                            userId));
 }
 
 GetUserProfileJob::GetUserProfileJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetUserProfileJob"),
-              QStringLiteral("/_matrix/client/r0") % "/profile/" % userId, false)
+              makePath("/_matrix/client/r0", "/profile/", userId), false)
 {}
diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp
index 028022c5..ef4b3767 100644
--- a/lib/csapi/pusher.cpp
+++ b/lib/csapi/pusher.cpp
@@ -4,20 +4,17 @@
 
 #include "pusher.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetPushersJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushers");
+                                   makePath("/_matrix/client/r0", "/pushers"));
 }
 
 GetPushersJob::GetPushersJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPushersJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushers")
+              makePath("/_matrix/client/r0", "/pushers"))
 {}
 
 PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind,
@@ -26,7 +23,7 @@ PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind,
                              const QString& lang, const PusherData& data,
                              const QString& profileTag, Omittable<bool> append)
     : BaseJob(HttpVerb::Post, QStringLiteral("PostPusherJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushers/set")
+              makePath("/_matrix/client/r0", "/pushers/set"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("pushkey"), pushkey);
diff --git a/lib/csapi/pushrules.cpp b/lib/csapi/pushrules.cpp
index ab7d0038..0d840788 100644
--- a/lib/csapi/pushrules.cpp
+++ b/lib/csapi/pushrules.cpp
@@ -4,20 +4,17 @@
 
 #include "pushrules.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetPushRulesJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushrules");
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl), makePath("/_matrix/client/r0", "/pushrules"));
 }
 
 GetPushRulesJob::GetPushRulesJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPushRulesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules")
+              makePath("/_matrix/client/r0", "/pushrules"))
 {
     addExpectedKey("global");
 }
@@ -26,16 +23,15 @@ QUrl GetPushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
                                     const QString& kind, const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushrules/" % scope % "/" % kind
-                                       % "/" % ruleId);
+                                   makePath("/_matrix/client/r0", "/pushrules/",
+                                            scope, "/", kind, "/", ruleId));
 }
 
 GetPushRuleJob::GetPushRuleJob(const QString& scope, const QString& kind,
                                const QString& ruleId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPushRuleJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId)
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId))
 {}
 
 QUrl DeletePushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
@@ -43,16 +39,15 @@ QUrl DeletePushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
                                        const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushrules/" % scope % "/" % kind
-                                       % "/" % ruleId);
+                                   makePath("/_matrix/client/r0", "/pushrules/",
+                                            scope, "/", kind, "/", ruleId));
 }
 
 DeletePushRuleJob::DeletePushRuleJob(const QString& scope, const QString& kind,
                                      const QString& ruleId)
     : BaseJob(HttpVerb::Delete, QStringLiteral("DeletePushRuleJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId)
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId))
 {}
 
 auto queryToSetPushRule(const QString& before, const QString& after)
@@ -70,8 +65,8 @@ SetPushRuleJob::SetPushRuleJob(const QString& scope, const QString& kind,
                                const QVector<PushCondition>& conditions,
                                const QString& pattern)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetPushRuleJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId,
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId),
               queryToSetPushRule(before, after))
 {
     QJsonObject _data;
@@ -86,17 +81,17 @@ QUrl IsPushRuleEnabledJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
                                           const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushrules/" % scope % "/" % kind
-                                       % "/" % ruleId % "/enabled");
+                                   makePath("/_matrix/client/r0", "/pushrules/",
+                                            scope, "/", kind, "/", ruleId,
+                                            "/enabled"));
 }
 
 IsPushRuleEnabledJob::IsPushRuleEnabledJob(const QString& scope,
                                            const QString& kind,
                                            const QString& ruleId)
     : BaseJob(HttpVerb::Get, QStringLiteral("IsPushRuleEnabledJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId % "/enabled")
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId, "/enabled"))
 {
     addExpectedKey("enabled");
 }
@@ -105,8 +100,8 @@ SetPushRuleEnabledJob::SetPushRuleEnabledJob(const QString& scope,
                                              const QString& kind,
                                              const QString& ruleId, bool enabled)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetPushRuleEnabledJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId % "/enabled")
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId, "/enabled"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("enabled"), enabled);
@@ -118,17 +113,17 @@ QUrl GetPushRuleActionsJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
                                            const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushrules/" % scope % "/" % kind
-                                       % "/" % ruleId % "/actions");
+                                   makePath("/_matrix/client/r0", "/pushrules/",
+                                            scope, "/", kind, "/", ruleId,
+                                            "/actions"));
 }
 
 GetPushRuleActionsJob::GetPushRuleActionsJob(const QString& scope,
                                              const QString& kind,
                                              const QString& ruleId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPushRuleActionsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId % "/actions")
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId, "/actions"))
 {
     addExpectedKey("actions");
 }
@@ -138,8 +133,8 @@ SetPushRuleActionsJob::SetPushRuleActionsJob(const QString& scope,
                                              const QString& ruleId,
                                              const QVector<QVariant>& actions)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetPushRuleActionsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId % "/actions")
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId, "/actions"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("actions"), actions);
diff --git a/lib/csapi/read_markers.cpp b/lib/csapi/read_markers.cpp
index 39e4d148..f2edb71e 100644
--- a/lib/csapi/read_markers.cpp
+++ b/lib/csapi/read_markers.cpp
@@ -4,16 +4,13 @@
 
 #include "read_markers.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SetReadMarkerJob::SetReadMarkerJob(const QString& roomId,
                                    const QString& mFullyRead,
                                    const QString& mRead)
     : BaseJob(HttpVerb::Post, QStringLiteral("SetReadMarkerJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/read_markers")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/read_markers"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("m.fully_read"), mFullyRead);
diff --git a/lib/csapi/receipts.cpp b/lib/csapi/receipts.cpp
index 47b18174..401c3bfe 100644
--- a/lib/csapi/receipts.cpp
+++ b/lib/csapi/receipts.cpp
@@ -4,16 +4,14 @@
 
 #include "receipts.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 PostReceiptJob::PostReceiptJob(const QString& roomId, const QString& receiptType,
                                const QString& eventId,
                                const QJsonObject& receipt)
     : BaseJob(HttpVerb::Post, QStringLiteral("PostReceiptJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/receipt/" % receiptType % "/" % eventId)
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/receipt/",
+                       receiptType, "/", eventId))
 {
     setRequestData(RequestData(toJson(receipt)));
 }
diff --git a/lib/csapi/redaction.cpp b/lib/csapi/redaction.cpp
index 91497064..acf1b0e4 100644
--- a/lib/csapi/redaction.cpp
+++ b/lib/csapi/redaction.cpp
@@ -4,15 +4,13 @@
 
 #include "redaction.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId,
                                const QString& txnId, const QString& reason)
     : BaseJob(HttpVerb::Put, QStringLiteral("RedactEventJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/redact/" % eventId % "/" % txnId)
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/redact/",
+                       eventId, "/", txnId))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
diff --git a/lib/csapi/registration.cpp b/lib/csapi/registration.cpp
index c3617bfc..153abcee 100644
--- a/lib/csapi/registration.cpp
+++ b/lib/csapi/registration.cpp
@@ -4,8 +4,6 @@
 
 #include "registration.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToRegister(const QString& kind)
@@ -22,7 +20,7 @@ RegisterJob::RegisterJob(const QString& kind,
                          const QString& initialDeviceDisplayName,
                          Omittable<bool> inhibitLogin)
     : BaseJob(HttpVerb::Post, QStringLiteral("RegisterJob"),
-              QStringLiteral("/_matrix/client/r0") % "/register",
+              makePath("/_matrix/client/r0", "/register"),
               queryToRegister(kind), {}, false)
 {
     QJsonObject _data;
@@ -40,8 +38,7 @@ RegisterJob::RegisterJob(const QString& kind,
 RequestTokenToRegisterEmailJob::RequestTokenToRegisterEmailJob(
     const EmailValidationData& body)
     : BaseJob(HttpVerb::Post, QStringLiteral("RequestTokenToRegisterEmailJob"),
-              QStringLiteral("/_matrix/client/r0")
-                  % "/register/email/requestToken",
+              makePath("/_matrix/client/r0", "/register/email/requestToken"),
               false)
 {
     setRequestData(RequestData(toJson(body)));
@@ -50,8 +47,7 @@ RequestTokenToRegisterEmailJob::RequestTokenToRegisterEmailJob(
 RequestTokenToRegisterMSISDNJob::RequestTokenToRegisterMSISDNJob(
     const MsisdnValidationData& body)
     : BaseJob(HttpVerb::Post, QStringLiteral("RequestTokenToRegisterMSISDNJob"),
-              QStringLiteral("/_matrix/client/r0")
-                  % "/register/msisdn/requestToken",
+              makePath("/_matrix/client/r0", "/register/msisdn/requestToken"),
               false)
 {
     setRequestData(RequestData(toJson(body)));
@@ -61,7 +57,7 @@ ChangePasswordJob::ChangePasswordJob(const QString& newPassword,
                                      bool logoutDevices,
                                      const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/password")
+              makePath("/_matrix/client/r0", "/account/password"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("new_password"), newPassword);
@@ -74,8 +70,8 @@ RequestTokenToResetPasswordEmailJob::RequestTokenToResetPasswordEmailJob(
     const EmailValidationData& body)
     : BaseJob(HttpVerb::Post,
               QStringLiteral("RequestTokenToResetPasswordEmailJob"),
-              QStringLiteral("/_matrix/client/r0")
-                  % "/account/password/email/requestToken",
+              makePath("/_matrix/client/r0",
+                       "/account/password/email/requestToken"),
               false)
 {
     setRequestData(RequestData(toJson(body)));
@@ -85,8 +81,8 @@ RequestTokenToResetPasswordMSISDNJob::RequestTokenToResetPasswordMSISDNJob(
     const MsisdnValidationData& body)
     : BaseJob(HttpVerb::Post,
               QStringLiteral("RequestTokenToResetPasswordMSISDNJob"),
-              QStringLiteral("/_matrix/client/r0")
-                  % "/account/password/msisdn/requestToken",
+              makePath("/_matrix/client/r0",
+                       "/account/password/msisdn/requestToken"),
               false)
 {
     setRequestData(RequestData(toJson(body)));
@@ -95,7 +91,7 @@ RequestTokenToResetPasswordMSISDNJob::RequestTokenToResetPasswordMSISDNJob(
 DeactivateAccountJob::DeactivateAccountJob(
     const Omittable<AuthenticationData>& auth, const QString& idServer)
     : BaseJob(HttpVerb::Post, QStringLiteral("DeactivateAccountJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/deactivate")
+              makePath("/_matrix/client/r0", "/account/deactivate"))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
@@ -115,13 +111,13 @@ QUrl CheckUsernameAvailabilityJob::makeRequestUrl(QUrl baseUrl,
                                                   const QString& username)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/register/available",
+                                   makePath("/_matrix/client/r0",
+                                            "/register/available"),
                                    queryToCheckUsernameAvailability(username));
 }
 
 CheckUsernameAvailabilityJob::CheckUsernameAvailabilityJob(const QString& username)
     : BaseJob(HttpVerb::Get, QStringLiteral("CheckUsernameAvailabilityJob"),
-              QStringLiteral("/_matrix/client/r0") % "/register/available",
+              makePath("/_matrix/client/r0", "/register/available"),
               queryToCheckUsernameAvailability(username), {}, false)
 {}
diff --git a/lib/csapi/report_content.cpp b/lib/csapi/report_content.cpp
index ea906380..0a76d5b8 100644
--- a/lib/csapi/report_content.cpp
+++ b/lib/csapi/report_content.cpp
@@ -4,15 +4,13 @@
 
 #include "report_content.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 ReportContentJob::ReportContentJob(const QString& roomId, const QString& eventId,
                                    Omittable<int> score, const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("ReportContentJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/report/" % eventId)
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/report/",
+                       eventId))
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("score"), score);
diff --git a/lib/csapi/room_send.cpp b/lib/csapi/room_send.cpp
index 9fd8cb96..f80f9300 100644
--- a/lib/csapi/room_send.cpp
+++ b/lib/csapi/room_send.cpp
@@ -4,15 +4,13 @@
 
 #include "room_send.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SendMessageJob::SendMessageJob(const QString& roomId, const QString& eventType,
                                const QString& txnId, const QJsonObject& body)
     : BaseJob(HttpVerb::Put, QStringLiteral("SendMessageJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/send/" % eventType % "/" % txnId)
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/send/",
+                       eventType, "/", txnId))
 {
     setRequestData(RequestData(toJson(body)));
     addExpectedKey("event_id");
diff --git a/lib/csapi/room_state.cpp b/lib/csapi/room_state.cpp
index 37e897fa..f6d2e6ec 100644
--- a/lib/csapi/room_state.cpp
+++ b/lib/csapi/room_state.cpp
@@ -4,8 +4,6 @@
 
 #include "room_state.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SetRoomStateWithKeyJob::SetRoomStateWithKeyJob(const QString& roomId,
@@ -13,8 +11,8 @@ SetRoomStateWithKeyJob::SetRoomStateWithKeyJob(const QString& roomId,
                                                const QString& stateKey,
                                                const QJsonObject& body)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetRoomStateWithKeyJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/state/" % eventType % "/" % stateKey)
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/state/",
+                       eventType, "/", stateKey))
 {
     setRequestData(RequestData(toJson(body)));
     addExpectedKey("event_id");
diff --git a/lib/csapi/room_upgrades.cpp b/lib/csapi/room_upgrades.cpp
index e3791b08..d4129cfb 100644
--- a/lib/csapi/room_upgrades.cpp
+++ b/lib/csapi/room_upgrades.cpp
@@ -4,14 +4,11 @@
 
 #include "room_upgrades.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 UpgradeRoomJob::UpgradeRoomJob(const QString& roomId, const QString& newVersion)
     : BaseJob(HttpVerb::Post, QStringLiteral("UpgradeRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/upgrade")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/upgrade"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("new_version"), newVersion);
diff --git a/lib/csapi/rooms.cpp b/lib/csapi/rooms.cpp
index 3dd87021..5310aa32 100644
--- a/lib/csapi/rooms.cpp
+++ b/lib/csapi/rooms.cpp
@@ -4,24 +4,21 @@
 
 #include "rooms.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetOneRoomEventJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
                                         const QString& eventId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/event/"
-                                       % eventId);
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/event/", eventId));
 }
 
 GetOneRoomEventJob::GetOneRoomEventJob(const QString& roomId,
                                        const QString& eventId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetOneRoomEventJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/event/" % eventId)
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/event/",
+                       eventId))
 {}
 
 QUrl GetRoomStateWithKeyJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
@@ -29,30 +26,29 @@ QUrl GetRoomStateWithKeyJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
                                             const QString& stateKey)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/state/"
-                                       % eventType % "/" % stateKey);
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/state/", eventType, "/",
+                                            stateKey));
 }
 
 GetRoomStateWithKeyJob::GetRoomStateWithKeyJob(const QString& roomId,
                                                const QString& eventType,
                                                const QString& stateKey)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomStateWithKeyJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/state/" % eventType % "/" % stateKey)
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/state/",
+                       eventType, "/", stateKey))
 {}
 
 QUrl GetRoomStateJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/state");
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/state"));
 }
 
 GetRoomStateJob::GetRoomStateJob(const QString& roomId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomStateJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/state")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/state"))
 {}
 
 auto queryToGetMembersByRoom(const QString& at, const QString& membership,
@@ -72,7 +68,7 @@ QUrl GetMembersByRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
 {
     return BaseJob::makeRequestUrl(
         std::move(baseUrl),
-        QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/members",
+        makePath("/_matrix/client/r0", "/rooms/", roomId, "/members"),
         queryToGetMembersByRoom(at, membership, notMembership));
 }
 
@@ -81,8 +77,7 @@ GetMembersByRoomJob::GetMembersByRoomJob(const QString& roomId,
                                          const QString& membership,
                                          const QString& notMembership)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetMembersByRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/members",
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/members"),
               queryToGetMembersByRoom(at, membership, notMembership))
 {}
 
@@ -90,12 +85,12 @@ QUrl GetJoinedMembersByRoomJob::makeRequestUrl(QUrl baseUrl,
                                                const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/joined_members");
+                                   makePath("/_matrix/client/r0", "/rooms/",
+                                            roomId, "/joined_members"));
 }
 
 GetJoinedMembersByRoomJob::GetJoinedMembersByRoomJob(const QString& roomId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetJoinedMembersByRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/joined_members")
+              makePath("/_matrix/client/r0", "/rooms/", roomId,
+                       "/joined_members"))
 {}
diff --git a/lib/csapi/search.cpp b/lib/csapi/search.cpp
index 05ad871e..295dd1cc 100644
--- a/lib/csapi/search.cpp
+++ b/lib/csapi/search.cpp
@@ -4,8 +4,6 @@
 
 #include "search.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToSearch(const QString& nextBatch)
@@ -18,7 +16,7 @@ auto queryToSearch(const QString& nextBatch)
 SearchJob::SearchJob(const Categories& searchCategories,
                      const QString& nextBatch)
     : BaseJob(HttpVerb::Post, QStringLiteral("SearchJob"),
-              QStringLiteral("/_matrix/client/r0") % "/search",
+              makePath("/_matrix/client/r0", "/search"),
               queryToSearch(nextBatch))
 {
     QJsonObject _data;
diff --git a/lib/csapi/sso_login_redirect.cpp b/lib/csapi/sso_login_redirect.cpp
index 92601b4d..871d6ff6 100644
--- a/lib/csapi/sso_login_redirect.cpp
+++ b/lib/csapi/sso_login_redirect.cpp
@@ -4,8 +4,6 @@
 
 #include "sso_login_redirect.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToRedirectToSSO(const QString& redirectUrl)
@@ -18,14 +16,14 @@ auto queryToRedirectToSSO(const QString& redirectUrl)
 QUrl RedirectToSSOJob::makeRequestUrl(QUrl baseUrl, const QString& redirectUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/login/sso/redirect",
+                                   makePath("/_matrix/client/r0",
+                                            "/login/sso/redirect"),
                                    queryToRedirectToSSO(redirectUrl));
 }
 
 RedirectToSSOJob::RedirectToSSOJob(const QString& redirectUrl)
     : BaseJob(HttpVerb::Get, QStringLiteral("RedirectToSSOJob"),
-              QStringLiteral("/_matrix/client/r0") % "/login/sso/redirect",
+              makePath("/_matrix/client/r0", "/login/sso/redirect"),
               queryToRedirectToSSO(redirectUrl), {}, false)
 {}
 
@@ -40,15 +38,14 @@ QUrl RedirectToIdPJob::makeRequestUrl(QUrl baseUrl, const QString& idpId,
                                       const QString& redirectUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/login/sso/redirect/" % idpId,
+                                   makePath("/_matrix/client/r0",
+                                            "/login/sso/redirect/", idpId),
                                    queryToRedirectToIdP(redirectUrl));
 }
 
 RedirectToIdPJob::RedirectToIdPJob(const QString& idpId,
                                    const QString& redirectUrl)
     : BaseJob(HttpVerb::Get, QStringLiteral("RedirectToIdPJob"),
-              QStringLiteral("/_matrix/client/r0") % "/login/sso/redirect/"
-                  % idpId,
+              makePath("/_matrix/client/r0", "/login/sso/redirect/", idpId),
               queryToRedirectToIdP(redirectUrl), {}, false)
 {}
diff --git a/lib/csapi/tags.cpp b/lib/csapi/tags.cpp
index dc22dc18..f717de6e 100644
--- a/lib/csapi/tags.cpp
+++ b/lib/csapi/tags.cpp
@@ -4,30 +4,28 @@
 
 #include "tags.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetRoomTagsJob::makeRequestUrl(QUrl baseUrl, const QString& userId,
                                     const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0") % "/user/"
-                                       % userId % "/rooms/" % roomId % "/tags");
+                                   makePath("/_matrix/client/r0", "/user/",
+                                            userId, "/rooms/", roomId, "/tags"));
 }
 
 GetRoomTagsJob::GetRoomTagsJob(const QString& userId, const QString& roomId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomTagsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/rooms/" % roomId % "/tags")
+              makePath("/_matrix/client/r0", "/user/", userId, "/rooms/",
+                       roomId, "/tags"))
 {}
 
 SetRoomTagJob::SetRoomTagJob(const QString& userId, const QString& roomId,
                              const QString& tag, Omittable<float> order,
                              const QVariantHash& additionalProperties)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetRoomTagJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/rooms/" % roomId % "/tags/" % tag)
+              makePath("/_matrix/client/r0", "/user/", userId, "/rooms/",
+                       roomId, "/tags/", tag))
 {
     QJsonObject _data;
     fillJson(_data, additionalProperties);
@@ -39,14 +37,14 @@ QUrl DeleteRoomTagJob::makeRequestUrl(QUrl baseUrl, const QString& userId,
                                       const QString& roomId, const QString& tag)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/user/" % userId % "/rooms/" % roomId
-                                       % "/tags/" % tag);
+                                   makePath("/_matrix/client/r0", "/user/",
+                                            userId, "/rooms/", roomId, "/tags/",
+                                            tag));
 }
 
 DeleteRoomTagJob::DeleteRoomTagJob(const QString& userId, const QString& roomId,
                                    const QString& tag)
     : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteRoomTagJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
-                  % "/rooms/" % roomId % "/tags/" % tag)
+              makePath("/_matrix/client/r0", "/user/", userId, "/rooms/",
+                       roomId, "/tags/", tag))
 {}
diff --git a/lib/csapi/third_party_lookup.cpp b/lib/csapi/third_party_lookup.cpp
index 93687a76..4c930668 100644
--- a/lib/csapi/third_party_lookup.cpp
+++ b/lib/csapi/third_party_lookup.cpp
@@ -4,34 +4,31 @@
 
 #include "third_party_lookup.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetProtocolsJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/thirdparty/protocols");
+                                   makePath("/_matrix/client/r0",
+                                            "/thirdparty/protocols"));
 }
 
 GetProtocolsJob::GetProtocolsJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetProtocolsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/thirdparty/protocols")
+              makePath("/_matrix/client/r0", "/thirdparty/protocols"))
 {}
 
 QUrl GetProtocolMetadataJob::makeRequestUrl(QUrl baseUrl,
                                             const QString& protocol)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/thirdparty/protocol/" % protocol);
+                                   makePath("/_matrix/client/r0",
+                                            "/thirdparty/protocol/", protocol));
 }
 
 GetProtocolMetadataJob::GetProtocolMetadataJob(const QString& protocol)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetProtocolMetadataJob"),
-              QStringLiteral("/_matrix/client/r0") % "/thirdparty/protocol/"
-                  % protocol)
+              makePath("/_matrix/client/r0", "/thirdparty/protocol/", protocol))
 {}
 
 auto queryToQueryLocationByProtocol(const QString& searchFields)
@@ -46,16 +43,15 @@ QUrl QueryLocationByProtocolJob::makeRequestUrl(QUrl baseUrl,
                                                 const QString& searchFields)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/thirdparty/location/" % protocol,
+                                   makePath("/_matrix/client/r0",
+                                            "/thirdparty/location/", protocol),
                                    queryToQueryLocationByProtocol(searchFields));
 }
 
 QueryLocationByProtocolJob::QueryLocationByProtocolJob(
     const QString& protocol, const QString& searchFields)
     : BaseJob(HttpVerb::Get, QStringLiteral("QueryLocationByProtocolJob"),
-              QStringLiteral("/_matrix/client/r0") % "/thirdparty/location/"
-                  % protocol,
+              makePath("/_matrix/client/r0", "/thirdparty/location/", protocol),
               queryToQueryLocationByProtocol(searchFields))
 {}
 
@@ -71,16 +67,15 @@ QUrl QueryUserByProtocolJob::makeRequestUrl(QUrl baseUrl,
                                             const QString& fields)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/thirdparty/user/" % protocol,
+                                   makePath("/_matrix/client/r0",
+                                            "/thirdparty/user/", protocol),
                                    queryToQueryUserByProtocol(fields));
 }
 
 QueryUserByProtocolJob::QueryUserByProtocolJob(const QString& protocol,
                                                const QString& fields)
     : BaseJob(HttpVerb::Get, QStringLiteral("QueryUserByProtocolJob"),
-              QStringLiteral("/_matrix/client/r0") % "/thirdparty/user/"
-                  % protocol,
+              makePath("/_matrix/client/r0", "/thirdparty/user/", protocol),
               queryToQueryUserByProtocol(fields))
 {}
 
@@ -94,14 +89,14 @@ auto queryToQueryLocationByAlias(const QString& alias)
 QUrl QueryLocationByAliasJob::makeRequestUrl(QUrl baseUrl, const QString& alias)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/thirdparty/location",
+                                   makePath("/_matrix/client/r0",
+                                            "/thirdparty/location"),
                                    queryToQueryLocationByAlias(alias));
 }
 
 QueryLocationByAliasJob::QueryLocationByAliasJob(const QString& alias)
     : BaseJob(HttpVerb::Get, QStringLiteral("QueryLocationByAliasJob"),
-              QStringLiteral("/_matrix/client/r0") % "/thirdparty/location",
+              makePath("/_matrix/client/r0", "/thirdparty/location"),
               queryToQueryLocationByAlias(alias))
 {}
 
@@ -115,13 +110,13 @@ auto queryToQueryUserByID(const QString& userid)
 QUrl QueryUserByIDJob::makeRequestUrl(QUrl baseUrl, const QString& userid)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/thirdparty/user",
+                                   makePath("/_matrix/client/r0",
+                                            "/thirdparty/user"),
                                    queryToQueryUserByID(userid));
 }
 
 QueryUserByIDJob::QueryUserByIDJob(const QString& userid)
     : BaseJob(HttpVerb::Get, QStringLiteral("QueryUserByIDJob"),
-              QStringLiteral("/_matrix/client/r0") % "/thirdparty/user",
+              makePath("/_matrix/client/r0", "/thirdparty/user"),
               queryToQueryUserByID(userid))
 {}
diff --git a/lib/csapi/third_party_membership.cpp b/lib/csapi/third_party_membership.cpp
index fda772d2..59275e41 100644
--- a/lib/csapi/third_party_membership.cpp
+++ b/lib/csapi/third_party_membership.cpp
@@ -4,16 +4,13 @@
 
 #include "third_party_membership.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 InviteBy3PIDJob::InviteBy3PIDJob(const QString& roomId, const QString& idServer,
                                  const QString& idAccessToken,
                                  const QString& medium, const QString& address)
     : BaseJob(HttpVerb::Post, QStringLiteral("InviteBy3PIDJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/invite")
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/invite"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("id_server"), idServer);
diff --git a/lib/csapi/to_device.cpp b/lib/csapi/to_device.cpp
index 3775174d..628e8314 100644
--- a/lib/csapi/to_device.cpp
+++ b/lib/csapi/to_device.cpp
@@ -4,16 +4,14 @@
 
 #include "to_device.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SendToDeviceJob::SendToDeviceJob(
     const QString& eventType, const QString& txnId,
     const QHash<QString, QHash<QString, QJsonObject>>& messages)
     : BaseJob(HttpVerb::Put, QStringLiteral("SendToDeviceJob"),
-              QStringLiteral("/_matrix/client/r0") % "/sendToDevice/"
-                  % eventType % "/" % txnId)
+              makePath("/_matrix/client/r0", "/sendToDevice/", eventType, "/",
+                       txnId))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("messages"), messages);
diff --git a/lib/csapi/typing.cpp b/lib/csapi/typing.cpp
index 8e214053..c9673118 100644
--- a/lib/csapi/typing.cpp
+++ b/lib/csapi/typing.cpp
@@ -4,15 +4,13 @@
 
 #include "typing.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId,
                            bool typing, Omittable<int> timeout)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetTypingJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/typing/" % userId)
+              makePath("/_matrix/client/r0", "/rooms/", roomId, "/typing/",
+                       userId))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("typing"), typing);
diff --git a/lib/csapi/users.cpp b/lib/csapi/users.cpp
index a0279d7e..48b727f0 100644
--- a/lib/csapi/users.cpp
+++ b/lib/csapi/users.cpp
@@ -4,14 +4,12 @@
 
 #include "users.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm,
                                                Omittable<int> limit)
     : BaseJob(HttpVerb::Post, QStringLiteral("SearchUserDirectoryJob"),
-              QStringLiteral("/_matrix/client/r0") % "/user_directory/search")
+              makePath("/_matrix/client/r0", "/user_directory/search"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("search_term"), searchTerm);
diff --git a/lib/csapi/versions.cpp b/lib/csapi/versions.cpp
index 9003e27f..a1efc33e 100644
--- a/lib/csapi/versions.cpp
+++ b/lib/csapi/versions.cpp
@@ -4,20 +4,17 @@
 
 #include "versions.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetVersionsJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client")
-                                       % "/versions");
+                                   makePath("/_matrix/client", "/versions"));
 }
 
 GetVersionsJob::GetVersionsJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetVersionsJob"),
-              QStringLiteral("/_matrix/client") % "/versions", false)
+              makePath("/_matrix/client", "/versions"), false)
 {
     addExpectedKey("versions");
 }
diff --git a/lib/csapi/voip.cpp b/lib/csapi/voip.cpp
index 43170057..c748ad94 100644
--- a/lib/csapi/voip.cpp
+++ b/lib/csapi/voip.cpp
@@ -4,18 +4,15 @@
 
 #include "voip.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetTurnServerJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/voip/turnServer");
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl), makePath("/_matrix/client/r0", "/voip/turnServer"));
 }
 
 GetTurnServerJob::GetTurnServerJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetTurnServerJob"),
-              QStringLiteral("/_matrix/client/r0") % "/voip/turnServer")
+              makePath("/_matrix/client/r0", "/voip/turnServer"))
 {}
diff --git a/lib/csapi/wellknown.cpp b/lib/csapi/wellknown.cpp
index 1aa0a90b..0b441279 100644
--- a/lib/csapi/wellknown.cpp
+++ b/lib/csapi/wellknown.cpp
@@ -4,18 +4,15 @@
 
 #include "wellknown.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetWellknownJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/.well-known")
-                                       % "/matrix/client");
+                                   makePath("/.well-known", "/matrix/client"));
 }
 
 GetWellknownJob::GetWellknownJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetWellknownJob"),
-              QStringLiteral("/.well-known") % "/matrix/client", false)
+              makePath("/.well-known", "/matrix/client"), false)
 {}
diff --git a/lib/csapi/whoami.cpp b/lib/csapi/whoami.cpp
index 73f0298e..ed8a9817 100644
--- a/lib/csapi/whoami.cpp
+++ b/lib/csapi/whoami.cpp
@@ -4,20 +4,17 @@
 
 #include "whoami.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetTokenOwnerJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/account/whoami");
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl), makePath("/_matrix/client/r0", "/account/whoami"));
 }
 
 GetTokenOwnerJob::GetTokenOwnerJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetTokenOwnerJob"),
-              QStringLiteral("/_matrix/client/r0") % "/account/whoami")
+              makePath("/_matrix/client/r0", "/account/whoami"))
 {
     addExpectedKey("user_id");
 }