diff --git a/src/lib/dbus/UDisks2.cxx b/src/lib/dbus/UDisks2.cxx
index 1cb231951..3c3f0c5c4 100644
--- a/src/lib/dbus/UDisks2.cxx
+++ b/src/lib/dbus/UDisks2.cxx
@@ -19,6 +19,7 @@
 
 #include "UDisks2.hxx"
 #include "ReadIter.hxx"
+#include "ObjectManager.hxx"
 #include "util/StringAPI.hxx"
 #include "Compiler.h"
 
@@ -98,4 +99,18 @@ ParseObject(Object &o, ODBus::ReadMessageIter &&i) noexcept
 		});
 }
 
+void
+ParseObjects(ODBus::ReadMessageIter &&i,
+	     std::function<void(Object &&o)> callback)
+{
+	using namespace ODBus;
+
+	ForEachInterface(std::move(i), [&callback](const char *path, auto &&j){
+			Object o(path);
+			ParseObject(o, std::move(j));
+			if (o.IsValid())
+				callback(std::move(o));
+		});
+}
+
 } // namespace UDisks2
diff --git a/src/lib/dbus/UDisks2.hxx b/src/lib/dbus/UDisks2.hxx
index 23d7fe599..b0a068fd1 100644
--- a/src/lib/dbus/UDisks2.hxx
+++ b/src/lib/dbus/UDisks2.hxx
@@ -21,6 +21,7 @@
 #define UDISKS2_HXX
 
 #include <string>
+#include <functional>
 
 #define UDISKS2_PATH "/org/freedesktop/UDisks2"
 #define UDISKS2_INTERFACE "org.freedesktop.UDisks2"
@@ -57,6 +58,14 @@ struct Object {
 void
 ParseObject(Object &o, ODBus::ReadMessageIter &&i) noexcept;
 
+/**
+ * Parse objects from an array/dictionary and invoke the callback for
+ * each.
+ */
+void
+ParseObjects(ODBus::ReadMessageIter &&i,
+	     std::function<void(Object &&o)> callback);
+
 } // namespace UDisks2
 
 #endif
diff --git a/src/neighbor/plugins/UdisksNeighborPlugin.cxx b/src/neighbor/plugins/UdisksNeighborPlugin.cxx
index 43e7fb056..dc809062d 100644
--- a/src/neighbor/plugins/UdisksNeighborPlugin.cxx
+++ b/src/neighbor/plugins/UdisksNeighborPlugin.cxx
@@ -231,12 +231,9 @@ UdisksNeighborExplorer::OnListNotify(ODBus::Message reply) noexcept
 		return;
 	}
 
-	ForEachInterface(i.Recurse(), [this](const char *path, auto &&j){
-			UDisks2::Object o(path);
-			UDisks2::ParseObject(o, std::move(j));
-			if (o.IsValid())
-				Insert(std::move(o));
-		});
+	ParseObjects(i.Recurse(),
+		     std::bind(&UdisksNeighborExplorer::Insert,
+			       this, std::placeholders::_1));
 }
 
 inline DBusHandlerResult