diff --git a/src/server/verify.c b/src/server/verify.c
index 198663e..fe7017a 100644
--- a/src/server/verify.c
+++ b/src/server/verify.c
@@ -29,8 +29,6 @@
 #include "server/stanzas.h"
 #include "server/log.h"
 
-static int depth = 0;
-static XMPPStanza *curr_stanza = NULL;
 static int timeoutsecs = 0;
 
 void
@@ -43,65 +41,19 @@ verify_set_timeout(int seconds)
     }
 }
 
-static void
-start_element(void *data, const char *element, const char **attributes)
-{
-    XMPPStanza *stanza = stanza_new(element, attributes);
-
-    if (depth == 0) {
-        curr_stanza = stanza;
-        curr_stanza->parent = NULL;
-    } else {
-        stanza->parent = curr_stanza;
-        curr_stanza = stanza;
-    }
-
-    depth++;
-}
-
-static void
-end_element(void *data, const char *element)
-{
-    depth--;
-
-    if (depth > 0) {
-        stanza_add_child(curr_stanza->parent, curr_stanza);
-        curr_stanza = curr_stanza->parent;
-    }
-}
-
-static void
-handle_data(void *data, const char *content, int length)
-{
-    if (!curr_stanza->content) {
-        curr_stanza->content = g_string_new("");
-    }
-
-    g_string_append_len(curr_stanza->content, content, length);
-}
-
 int
 verify_any(char *stanza_text)
 {
-    depth = 0;
-    if (curr_stanza) {
-        stanza_free(curr_stanza);
-    }
-    XML_Parser parser = XML_ParserCreate(NULL);
-    XML_SetElementHandler(parser, start_element, end_element);
-    XML_SetCharacterDataHandler(parser, handle_data);
-
-    XML_Parse(parser, stanza_text, strlen(stanza_text), 0);
-    XML_ParserFree(parser);
+    XMPPStanza *stanza = parse_stanza(stanza_text);
 
     int result = 0;
     if (timeoutsecs <= 0) {
-        result = stanzas_verify_any(curr_stanza);
+        result = stanzas_verify_any(stanza);
     } else {
         double elapsed = 0.0;
         GTimer *timer = g_timer_new();
         while (elapsed < timeoutsecs * 1.0) {
-            result = stanzas_verify_any(curr_stanza);
+            result = stanzas_verify_any(stanza);
             if (result) {
                 break;
             }
@@ -123,25 +75,16 @@ verify_any(char *stanza_text)
 int
 verify_last(char *stanza_text)
 {
-    depth = 0;
-    if (curr_stanza) {
-        stanza_free(curr_stanza);
-    }
-    XML_Parser parser = XML_ParserCreate(NULL);
-    XML_SetElementHandler(parser, start_element, end_element);
-    XML_SetCharacterDataHandler(parser, handle_data);
-
-    XML_Parse(parser, stanza_text, strlen(stanza_text), 0);
-    XML_ParserFree(parser);
+    XMPPStanza *stanza = parse_stanza(stanza_text);
 
     int result = 0;
     if (timeoutsecs <= 0) {
-        result = stanzas_verify_last(curr_stanza);
+        result = stanzas_verify_last(stanza);
     } else {
         double elapsed = 0.0;
         GTimer *timer = g_timer_new();
         while (elapsed < timeoutsecs * 1.0) {
-            result = stanzas_verify_last(curr_stanza);
+            result = stanzas_verify_last(stanza);
             if (result) {
                 break;
             }