diff --git a/sat/plugins/plugin_comp_file_sharing.py b/sat/plugins/plugin_comp_file_sharing.py
index 1093d1c7..152145d9 100644
--- a/sat/plugins/plugin_comp_file_sharing.py
+++ b/sat/plugins/plugin_comp_file_sharing.py
@@ -731,7 +731,7 @@ class FileSharing:
     def _getDirectoryMetadataElts(
             self, client, elt, file_data):
         try:
-            affiliation_elt = next(elt.elements((NS_FS_AFFILIATION, "affiliation")))
+            affiliation_elt = next(elt.elements(NS_FS_AFFILIATION, "affiliation"))
         except StopIteration:
             pass
         else:
diff --git a/sat/plugins/plugin_exp_invitation.py b/sat/plugins/plugin_exp_invitation.py
index be3593d4..72d47a80 100644
--- a/sat/plugins/plugin_exp_invitation.py
+++ b/sat/plugins/plugin_exp_invitation.py
@@ -268,7 +268,7 @@ class Invitation(object):
             args = [service, node, item_id, item_elt]
         else:
             try:
-                node_data_elt = next(pubsub_elt.elements((NS_INVITATION, "node_data")))
+                node_data_elt = next(pubsub_elt.elements(NS_INVITATION, "node_data"))
             except StopIteration:
                 raise exceptions.DataError("Bad invitation, ignoring")
             namespace = node_data_elt['namespace']
diff --git a/sat/plugins/plugin_misc_attach.py b/sat/plugins/plugin_misc_attach.py
index 2c1134e6..2c4d8b17 100644
--- a/sat/plugins/plugin_misc_attach.py
+++ b/sat/plugins/plugin_misc_attach.py
@@ -248,7 +248,7 @@ class AttachPlugin:
     async def defaultAttach(self, client, data):
         await self.uploadFiles(client, data)
         # TODO: handle xhtml-im
-        body_elt = next(data["xml"].elements((C.NS_CLIENT, "body")))
+        body_elt = next(data["xml"].elements(C.NS_CLIENT, "body"))
         attachments = data["extra"][C.MESS_KEY_ATTACHMENTS]
         if attachments:
             body_links = '\n'.join(a['url'] for a in attachments)
diff --git a/sat/plugins/plugin_sec_aesgcm.py b/sat/plugins/plugin_sec_aesgcm.py
index a10f26a6..6b1b5233 100644
--- a/sat/plugins/plugin_sec_aesgcm.py
+++ b/sat/plugins/plugin_sec_aesgcm.py
@@ -167,7 +167,7 @@ class AESGCM(object):
             attachments.clear()
             del data["extra"][C.MESS_KEY_ATTACHMENTS]
 
-        body_elt = next(data["xml"].elements((C.NS_CLIENT, "body")))
+        body_elt = next(data["xml"].elements(C.NS_CLIENT, "body"))
 
         for attachment in attachments:
             body_elt.addContent(attachment["url"])
diff --git a/sat/plugins/plugin_xep_0060.py b/sat/plugins/plugin_xep_0060.py
index 8a02c3ae..d4cb890b 100644
--- a/sat/plugins/plugin_xep_0060.py
+++ b/sat/plugins/plugin_xep_0060.py
@@ -966,7 +966,7 @@ class XEP_0060(object):
         def cb(iq_elt):
             try:
                 affiliations_elt = next(
-                    iq_elt.pubsub.elements((pubsub.NS_PUBSUB, "affiliations"))
+                    iq_elt.pubsub.elements(pubsub.NS_PUBSUB, "affiliations")
                 )
             except StopIteration:
                 raise ValueError(
@@ -977,7 +977,7 @@ class XEP_0060(object):
             try:
                 return {
                     e["node"]: e["affiliation"]
-                    for e in affiliations_elt.elements((pubsub.NS_PUBSUB, "affiliation"))
+                    for e in affiliations_elt.elements(pubsub.NS_PUBSUB, "affiliation")
                 }
             except KeyError:
                 raise ValueError(
@@ -1009,7 +1009,7 @@ class XEP_0060(object):
         def cb(iq_elt):
             try:
                 affiliations_elt = next(
-                    iq_elt.pubsub.elements((pubsub.NS_PUBSUB_OWNER, "affiliations"))
+                    iq_elt.pubsub.elements(pubsub.NS_PUBSUB_OWNER, "affiliations")
                 )
             except StopIteration:
                 raise ValueError(
@@ -1402,7 +1402,7 @@ class XEP_0060(object):
         iq_elt = await request.send(client.xmlstream)
         try:
             subscriptions_elt = next(
-                iq_elt.pubsub.elements((pubsub.NS_PUBSUB, "subscriptions"))
+                iq_elt.pubsub.elements(pubsub.NS_PUBSUB, "subscriptions")
             )
         except StopIteration:
             raise ValueError(
diff --git a/sat/plugins/plugin_xep_0234.py b/sat/plugins/plugin_xep_0234.py
index 4b5e4422..61e4d2e2 100644
--- a/sat/plugins/plugin_xep_0234.py
+++ b/sat/plugins/plugin_xep_0234.py
@@ -667,7 +667,7 @@ class XEP_0234:
                     return
                 file_data = content_data["application_data"]["file_data"]
                 try:
-                    file_elt = next(elt.elements((NS_JINGLE_FT, "file")))
+                    file_elt = next(elt.elements(NS_JINGLE_FT, "file"))
                 except StopIteration:
                     raise exceptions.DataError
                 algo, file_data["given_file_hash"] = self._hash.parseHashElt(file_elt)
diff --git a/sat/plugins/plugin_xep_0346.py b/sat/plugins/plugin_xep_0346.py
index a9c81dc6..a2155572 100644
--- a/sat/plugins/plugin_xep_0346.py
+++ b/sat/plugins/plugin_xep_0346.py
@@ -372,7 +372,7 @@ class PubsubSchema(object):
         items, metadata = items_data
         items_xmlui = []
         for item_elt in items:
-            for x_elt in item_elt.elements((data_form.NS_X_DATA, "x")):
+            for x_elt in item_elt.elements(data_form.NS_X_DATA, "x"):
                 form = data_form.Form.fromElement(x_elt)
                 if form_ns and form.formNamespace != form_ns:
                     log.debug(