From 6840051da33f41006fcce97374f5a7de1a3da8e0 Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Fri, 8 May 2026 14:43:37 -0400
Subject: [PATCH 1/4] Add Makefile target to format xml files that contain
 introspection data

Signed-off-by: mulhern <amulhern@redhat.com>
---
 Makefile           | 4 ++++
 docs/dbus/Makefile | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/Makefile b/Makefile
index d6b11c0..373c49b 100644
--- a/Makefile
+++ b/Makefile
@@ -65,9 +65,13 @@ website-copy: test-website-repo test-commit-msg clean website-distrib
 	(cd ./public; cp * -R ${WEBSITE_REPO})
 	(cd ${WEBSITE_REPO}; git add .; git commit -m "${COMMIT_MSG}")
 
+fmt:
+	(cd ./docs/dbus ; $(MAKE) fmt)
+
 .PHONY:
 	check
 	clean
+	fmt
 	pdfs
 	test-commit-msg
 	test-website-repo
diff --git a/docs/dbus/Makefile b/docs/dbus/Makefile
index 7678606..8553aee 100644
--- a/docs/dbus/Makefile
+++ b/docs/dbus/Makefile
@@ -9,6 +9,13 @@ check-closed-insets:
 
 check: check-closed-insets
 
+fmt:
+	xmllint --format ./blockdev.xml --output ./blockdev.xml
+	xmllint --format ./filesystem.xml --output ./filesystem.xml
+	xmllint --format ./manager.xml --output ./manager.xml
+	xmllint --format ./pool.xml --output ./pool.xml
+
 .PHONY:
 	check
 	check-closed-insets
+	fmt

From 120decee9f6b40dd477d62e5e4ffd82cde822221 Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Fri, 8 May 2026 21:11:11 -0400
Subject: [PATCH 2/4] Format introspection data using xmllint

Signed-off-by: mulhern <amulhern@redhat.com>
---
 docs/dbus/blockdev.xml   |  223 +++----
 docs/dbus/filesystem.xml |  237 +++----
 docs/dbus/manager.xml    |  822 ++++++++++++------------
 docs/dbus/pool.xml       | 1269 +++++++++++++++++++-------------------
 4 files changed, 1277 insertions(+), 1274 deletions(-)

diff --git a/docs/dbus/blockdev.xml b/docs/dbus/blockdev.xml
index 5e56ec0..cce0293 100644
--- a/docs/dbus/blockdev.xml
+++ b/docs/dbus/blockdev.xml
@@ -1,28 +1,29 @@
+<?xml version="1.0"?>
 <node name="/org/storage/stratis3/1">
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
-      <arg name="xml_data" type="s" direction="out" />
+      <arg name="xml_data" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.freedesktop.DBus.Properties">
     <method name="Get">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="property_name" type="s" direction="in" />
-      <arg name="value" type="v" direction="out" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="out"/>
     </method>
     <method name="GetAll">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="props" type="a{sv}" direction="out" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="props" type="a{sv}" direction="out"/>
     </method>
     <method name="Set">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="property_name" type="s" direction="in" />
-      <arg name="value" type="v" direction="in" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="in"/>
     </method>
     <signal name="PropertiesChanged">
-      <arg name="interface_name" type="s" />
-      <arg name="changed_properties" type="a{sv}" />
-      <arg name="invalidated_properties" type="as" />
+      <arg name="interface_name" type="s"/>
+      <arg name="changed_properties" type="a{sv}"/>
+      <arg name="invalidated_properties" type="as"/>
     </signal>
   </interface>
   <!-- Properties and methods on a block device. -->
@@ -30,26 +31,26 @@
     <!-- Set user-specified information on a block device. -->
     <method name="SetUserInfo">
       <!-- The information to set, as a string. -->
-      <arg name="id" type="(bs)" direction="in" />
+      <arg name="id" type="(bs)" direction="in"/>
       <!--
         b: True if the information was changed, otherwise false.
         s: UUID of the specified blockdev, or the default UUID if no change.
       -->
-      <arg name="changed" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="changed" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Device node of the block device. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Optional hardware id for this block device. -->
     <property name="HardwareInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Time that stratisd initialized the block device. -->
     <property name="InitializationTime" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       Physical path of the block device. This may be different from the device
@@ -59,51 +60,51 @@
       Stratis metadata is written.
     -->
     <property name="PhysicalPath" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Tier the block device occupies, either Data(0) or Cache(1). -->
     <property name="Tier" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Size of the block device's Devnode. -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!-- Optional user-defined string associated with this block device. -->
     <property name="UserInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Stratis UUID of this block device. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.blockdev.r1">
     <!-- Set user-specified information on a block device. -->
     <method name="SetUserInfo">
       <!-- The information to set, as a string. -->
-      <arg name="id" type="(bs)" direction="in" />
+      <arg name="id" type="(bs)" direction="in"/>
       <!--
         b: True if the information was changed, otherwise false.
         s: UUID of the specified blockdev, or the default UUID if no change.
       -->
-      <arg name="changed" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="changed" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Device node of the block device. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Optional hardware id for this block device. -->
     <property name="HardwareInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Time that stratisd initialized the block device. -->
     <property name="InitializationTime" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       Physical path of the block device. This may be different from the device
@@ -113,51 +114,51 @@
       Stratis metadata is written.
     -->
     <property name="PhysicalPath" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Tier the block device occupies, either Data(0) or Cache(1). -->
     <property name="Tier" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Size of the block device's Devnode. -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!-- Optional user-defined string associated with this block device. -->
     <property name="UserInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Stratis UUID of this block device. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.blockdev.r2">
     <!-- Set user-specified information on a block device. -->
     <method name="SetUserInfo">
       <!-- The information to set, as a string. -->
-      <arg name="id" type="(bs)" direction="in" />
+      <arg name="id" type="(bs)" direction="in"/>
       <!--
         b: True if the information was changed, otherwise false.
         s: UUID of the specified blockdev, or the default UUID if no change.
       -->
-      <arg name="changed" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="changed" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Device node of the block device. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Optional hardware id for this block device. -->
     <property name="HardwareInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Time that stratisd initialized the block device. -->
     <property name="InitializationTime" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       Physical path of the block device. This may be different from the device
@@ -167,45 +168,45 @@
       Stratis metadata is written.
     -->
     <property name="PhysicalPath" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Tier the block device occupies, either Data(0) or Cache(1). -->
     <property name="Tier" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Size of the block device's Devnode. -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!-- Optional user-defined string associated with this block device. -->
     <property name="UserInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Stratis UUID of this block device. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.blockdev.r3">
     <!-- Device node of the block device. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Optional hardware id for this block device. -->
     <property name="HardwareInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Time that stratisd initialized the block device. -->
     <property name="InitializationTime" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       Size of the block device's devnode, if different from the size recorded
       in the Stratis metadata.
     -->
-    <property name="NewPhysicalSize" type="(bs)" access="read" />
+    <property name="NewPhysicalSize" type="(bs)" access="read"/>
     <!--
       Physical path of the block device. This may be different from the device
       represented by the Devnode property. For example, with encryption, the
@@ -214,43 +215,43 @@
       Stratis metadata is written.
     -->
     <property name="PhysicalPath" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Tier the block device occupies, either Data(0) or Cache(1). -->
     <property name="Tier" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Size of the block device's Devnode. -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!-- Optional user-defined string associated with this block device. -->
-    <property name="UserInfo" type="(bs)" access="readwrite" />
+    <property name="UserInfo" type="(bs)" access="readwrite"/>
     <!-- Stratis UUID of this block device. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.blockdev.r4">
     <!-- Device node of the block device. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Optional hardware id for this block device. -->
     <property name="HardwareInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Time that stratisd initialized the block device. -->
     <property name="InitializationTime" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       Size of the block device's devnode, if different from the size recorded
       in the Stratis metadata.
     -->
-    <property name="NewPhysicalSize" type="(bs)" access="read" />
+    <property name="NewPhysicalSize" type="(bs)" access="read"/>
     <!--
       Physical path of the block device. This may be different from the device
       represented by the Devnode property. For example, with encryption, the
@@ -259,43 +260,43 @@
       Stratis metadata is written.
     -->
     <property name="PhysicalPath" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Tier the block device occupies, either Data(0) or Cache(1). -->
     <property name="Tier" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Size of the block device's Devnode. -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!-- Optional user-defined string associated with this block device. -->
-    <property name="UserInfo" type="(bs)" access="readwrite" />
+    <property name="UserInfo" type="(bs)" access="readwrite"/>
     <!-- Stratis UUID of this block device. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.blockdev.r5">
     <!-- Device node of the block device. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Optional hardware id for this block device. -->
     <property name="HardwareInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Time that stratisd initialized the block device. -->
     <property name="InitializationTime" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       Size of the block device's devnode, if different from the size recorded
       in the Stratis metadata.
     -->
-    <property name="NewPhysicalSize" type="(bs)" access="read" />
+    <property name="NewPhysicalSize" type="(bs)" access="read"/>
     <!--
       Physical path of the block device. This may be different from the device
       represented by the Devnode property. For example, with encryption, the
@@ -304,43 +305,43 @@
       Stratis metadata is written.
     -->
     <property name="PhysicalPath" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Tier the block device occupies, either Data(0) or Cache(1). -->
     <property name="Tier" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Size of the block device's Devnode. -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!-- Optional user-defined string associated with this block device. -->
-    <property name="UserInfo" type="(bs)" access="readwrite" />
+    <property name="UserInfo" type="(bs)" access="readwrite"/>
     <!-- Stratis UUID of this block device. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.blockdev.r6">
     <!-- Device node of the block device. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Optional hardware id for this block device. -->
     <property name="HardwareInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Time that stratisd initialized the block device. -->
     <property name="InitializationTime" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       Size of the block device's devnode, if different from the size recorded
       in the Stratis metadata.
     -->
-    <property name="NewPhysicalSize" type="(bs)" access="read" />
+    <property name="NewPhysicalSize" type="(bs)" access="read"/>
     <!--
       Physical path of the block device. This may be different from the device
       represented by the Devnode property. For example, with encryption, the
@@ -349,43 +350,43 @@
       Stratis metadata is written.
     -->
     <property name="PhysicalPath" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Tier the block device occupies, either Data(0) or Cache(1). -->
     <property name="Tier" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Size of the block device's Devnode. -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!-- Optional user-defined string associated with this block device. -->
-    <property name="UserInfo" type="(bs)" access="readwrite" />
+    <property name="UserInfo" type="(bs)" access="readwrite"/>
     <!-- Stratis UUID of this block device. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.blockdev.r7">
     <!-- Device node of the block device. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Optional hardware id for this block device. -->
     <property name="HardwareInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Time that stratisd initialized the block device. -->
     <property name="InitializationTime" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       Size of the block device's devnode, if different from the size recorded
       in the Stratis metadata.
     -->
-    <property name="NewPhysicalSize" type="(bs)" access="read" />
+    <property name="NewPhysicalSize" type="(bs)" access="read"/>
     <!--
       Physical path of the block device. This may be different from the device
       represented by the Devnode property. For example, with encryption, the
@@ -394,43 +395,43 @@
       Stratis metadata is written.
     -->
     <property name="PhysicalPath" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Tier the block device occupies, either Data(0) or Cache(1). -->
     <property name="Tier" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Size of the block device's Devnode. -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!-- Optional user-defined string associated with this block device. -->
-    <property name="UserInfo" type="(bs)" access="readwrite" />
+    <property name="UserInfo" type="(bs)" access="readwrite"/>
     <!-- Stratis UUID of this block device. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.blockdev.r8">
     <!-- Device node of the block device. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Optional hardware id for this block device. -->
     <property name="HardwareInfo" type="(bs)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Time that stratisd initialized the block device. -->
     <property name="InitializationTime" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       Size of the block device's devnode, if different from the size recorded
       in the Stratis metadata.
     -->
-    <property name="NewPhysicalSize" type="(bs)" access="read" />
+    <property name="NewPhysicalSize" type="(bs)" access="read"/>
     <!--
       Physical path of the block device. This may be different from the device
       represented by the Devnode property. For example, with encryption, the
@@ -439,23 +440,23 @@
       Stratis metadata is written.
     -->
     <property name="PhysicalPath" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Tier the block device occupies, either Data(0) or Cache(1). -->
     <property name="Tier" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
     </property>
     <!-- Size of the block device's Devnode. -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!-- Optional user-defined string associated with this block device. -->
-    <property name="UserInfo" type="(bs)" access="readwrite" />
+    <property name="UserInfo" type="(bs)" access="readwrite"/>
     <!-- Stratis UUID of this block device. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
 </node>
diff --git a/docs/dbus/filesystem.xml b/docs/dbus/filesystem.xml
index 3501dd4..de5be86 100644
--- a/docs/dbus/filesystem.xml
+++ b/docs/dbus/filesystem.xml
@@ -1,28 +1,29 @@
+<?xml version="1.0"?>
 <node name="/org/storage/stratis3/2">
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
-      <arg name="xml_data" type="s" direction="out" />
+      <arg name="xml_data" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.freedesktop.DBus.Properties">
     <method name="Get">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="property_name" type="s" direction="in" />
-      <arg name="value" type="v" direction="out" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="out"/>
     </method>
     <method name="GetAll">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="props" type="a{sv}" direction="out" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="props" type="a{sv}" direction="out"/>
     </method>
     <method name="Set">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="property_name" type="s" direction="in" />
-      <arg name="value" type="v" direction="in" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="in"/>
     </method>
     <signal name="PropertiesChanged">
-      <arg name="interface_name" type="s" />
-      <arg name="changed_properties" type="a{sv}" />
-      <arg name="invalidated_properties" type="as" />
+      <arg name="interface_name" type="s"/>
+      <arg name="changed_properties" type="a{sv}"/>
+      <arg name="invalidated_properties" type="as"/>
     </signal>
   </interface>
   <!-- Properties and methods on a filesystem. -->
@@ -30,338 +31,338 @@
     <!-- Set the filesystem name. -->
     <method name="SetName">
       <!-- The new name of the filesystem. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the filesystem or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Time the filesystem was created. -->
     <property name="Created" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Filesystem device node. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
     </property>
     <!-- Name of the filesystem. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Logical size of the filesystem. -->
-    <property name="Size" type="s" access="read" />
+    <property name="Size" type="s" access="read"/>
     <!-- Filesystem usage. -->
-    <property name="Used" type="(bs)" access="read" />
+    <property name="Used" type="(bs)" access="read"/>
     <!-- Filesystem UUID. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.filesystem.r1">
     <!-- Set the filesystem name. -->
     <method name="SetName">
       <!-- The new name of the filesystem. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the filesystem or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Time the filesystem was created. -->
     <property name="Created" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Filesystem device node. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
     </property>
     <!-- Name of the filesystem. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Logical size of the filesystem. -->
-    <property name="Size" type="s" access="read" />
+    <property name="Size" type="s" access="read"/>
     <!-- Filesystem usage. -->
-    <property name="Used" type="(bs)" access="read" />
+    <property name="Used" type="(bs)" access="read"/>
     <!-- Filesystem UUID. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.filesystem.r2">
     <!-- Set the filesystem name. -->
     <method name="SetName">
       <!-- The new name of the filesystem. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the filesystem or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Time the filesystem was created. -->
     <property name="Created" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Filesystem device node. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
     </property>
     <!-- Name of the filesystem. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Logical size of the filesystem. -->
-    <property name="Size" type="s" access="read" />
+    <property name="Size" type="s" access="read"/>
     <!-- Filesystem usage. -->
-    <property name="Used" type="(bs)" access="read" />
+    <property name="Used" type="(bs)" access="read"/>
     <!-- Filesystem UUID. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.filesystem.r3">
     <!-- Set the filesystem name. -->
     <method name="SetName">
       <!-- The new name of the filesystem. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the filesystem or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Time the filesystem was created. -->
     <property name="Created" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Filesystem device node. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
     </property>
     <!-- Name of the filesystem. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Logical size of the filesystem. -->
-    <property name="Size" type="s" access="read" />
+    <property name="Size" type="s" access="read"/>
     <!-- Filesystem usage. -->
-    <property name="Used" type="(bs)" access="read" />
+    <property name="Used" type="(bs)" access="read"/>
     <!-- Filesystem UUID. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.filesystem.r4">
     <!-- Set the filesystem name. -->
     <method name="SetName">
       <!-- The new name of the filesystem. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the filesystem or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Time the filesystem was created. -->
     <property name="Created" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Filesystem device node. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
     </property>
     <!-- Name of the filesystem. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Logical size of the filesystem. -->
-    <property name="Size" type="s" access="read" />
+    <property name="Size" type="s" access="read"/>
     <!-- Filesystem usage. -->
-    <property name="Used" type="(bs)" access="read" />
+    <property name="Used" type="(bs)" access="read"/>
     <!-- Filesystem UUID. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.filesystem.r5">
     <!-- Set the filesystem name. -->
     <method name="SetName">
       <!-- The new name of the filesystem. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the filesystem or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Time the filesystem was created. -->
     <property name="Created" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Filesystem device node. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
     </property>
     <!-- Name of the filesystem. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Logical size of the filesystem. -->
-    <property name="Size" type="s" access="read" />
+    <property name="Size" type="s" access="read"/>
     <!-- Filesystem usage. -->
-    <property name="Used" type="(bs)" access="read" />
+    <property name="Used" type="(bs)" access="read"/>
     <!-- Filesystem UUID. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.filesystem.r6">
     <!-- Set the filesystem name. -->
     <method name="SetName">
       <!-- The new name of the filesystem. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the filesystem or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Time the filesystem was created. -->
     <property name="Created" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Filesystem device node. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
     </property>
     <!-- Name of the filesystem. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Logical size of the filesystem. -->
-    <property name="Size" type="s" access="read" />
+    <property name="Size" type="s" access="read"/>
     <!-- Logical size limit of the filesystem. -->
-    <property name="SizeLimit" type="(bs)" access="readwrite" />
+    <property name="SizeLimit" type="(bs)" access="readwrite"/>
     <!-- Filesystem usage. -->
-    <property name="Used" type="(bs)" access="read" />
+    <property name="Used" type="(bs)" access="read"/>
     <!-- Filesystem UUID. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.filesystem.r7">
     <!-- Set the filesystem name. -->
     <method name="SetName">
       <!-- The new name of the filesystem. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the filesystem or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Time the filesystem was created. -->
     <property name="Created" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Filesystem device node. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
     </property>
     <!-- Whether this filesystem is scheduled to be merged into its origin. -->
-    <property name="MergeScheduled" type="b" access="readwrite" />
+    <property name="MergeScheduled" type="b" access="readwrite"/>
     <!-- Name of the filesystem. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!-- This filesystem's origin, if any. -->
-    <property name="Origin" type="(bs)" access="read" />
+    <property name="Origin" type="(bs)" access="read"/>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Logical size of the filesystem. -->
-    <property name="Size" type="s" access="read" />
+    <property name="Size" type="s" access="read"/>
     <!-- Logical size limit of the filesystem. -->
-    <property name="SizeLimit" type="(bs)" access="readwrite" />
+    <property name="SizeLimit" type="(bs)" access="readwrite"/>
     <!-- Filesystem usage. -->
-    <property name="Used" type="(bs)" access="read" />
+    <property name="Used" type="(bs)" access="read"/>
     <!-- Filesystem UUID. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.filesystem.r8">
     <!-- Set the filesystem name. -->
     <method name="SetName">
       <!-- The new name of the filesystem. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the filesystem or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Time the filesystem was created. -->
     <property name="Created" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Filesystem device node. -->
     <property name="Devnode" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
     </property>
     <!-- Whether this filesystem is scheduled to be merged into its origin. -->
-    <property name="MergeScheduled" type="b" access="readwrite" />
+    <property name="MergeScheduled" type="b" access="readwrite"/>
     <!-- Name of the filesystem. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!-- This filesystem's origin, if any. -->
-    <property name="Origin" type="(bs)" access="read" />
+    <property name="Origin" type="(bs)" access="read"/>
     <!-- Object path of the parent pool. -->
     <property name="Pool" type="o" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Logical size of the filesystem. -->
-    <property name="Size" type="s" access="read" />
+    <property name="Size" type="s" access="read"/>
     <!-- Logical size limit of the filesystem. -->
-    <property name="SizeLimit" type="(bs)" access="readwrite" />
+    <property name="SizeLimit" type="(bs)" access="readwrite"/>
     <!-- Filesystem usage. -->
-    <property name="Used" type="(bs)" access="read" />
+    <property name="Used" type="(bs)" access="read"/>
     <!-- Filesystem UUID. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
 </node>
diff --git a/docs/dbus/manager.xml b/docs/dbus/manager.xml
index 7640e3f..74a847f 100644
--- a/docs/dbus/manager.xml
+++ b/docs/dbus/manager.xml
@@ -2,31 +2,31 @@
 <node name="/org/storage/stratis3">
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
-      <arg name="xml_data" type="s" direction="out" />
+      <arg name="xml_data" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.freedesktop.DBus.ObjectManager">
-    <method name="GetManagedObjects" />
+    <method name="GetManagedObjects"/>
   </interface>
   <interface name="org.freedesktop.DBus.Properties">
     <method name="Get">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="property_name" type="s" direction="in" />
-      <arg name="value" type="v" direction="out" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="out"/>
     </method>
     <method name="GetAll">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="props" type="a{sv}" direction="out" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="props" type="a{sv}" direction="out"/>
     </method>
     <method name="Set">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="property_name" type="s" direction="in" />
-      <arg name="value" type="v" direction="in" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="in"/>
     </method>
     <signal name="PropertiesChanged">
-      <arg name="interface_name" type="s" />
-      <arg name="changed_properties" type="a{sv}" />
-      <arg name="invalidated_properties" type="as" />
+      <arg name="interface_name" type="s"/>
+      <arg name="changed_properties" type="a{sv}"/>
+      <arg name="invalidated_properties" type="as"/>
     </signal>
   </interface>
   <!--
@@ -37,19 +37,19 @@
     <!-- Create a single pool with the specified name and blockdevs. -->
     <method name="CreatePool">
       <!-- Name of the pool. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- Optional redundancy specification for the pool. -->
-      <arg name="redundancy" type="(bq)" direction="in" />
+      <arg name="redundancy" type="(bq)" direction="in"/>
       <!-- Device nodes of devices to form the pool -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!-- Optional key description of the key to use to encrypt the pool -->
-      <arg name="key_desc" type="(bs)" direction="in" />
+      <arg name="key_desc" type="(bs)" direction="in"/>
       <!--
          Optional Clevis information to use to encrypt the pool.
          s: Clevis "pin" specification, "tang" or "tpm".
          s: pin-specific Clevis configuration
       -->
-      <arg name="clevis_info" type="(b(ss))" direction="in" />
+      <arg name="clevis_info" type="(b(ss))" direction="in"/>
       <!--
          b: True if a pool was created, otherwise false.
          (oao): Result of the creation action, default values if no pool
@@ -57,22 +57,22 @@
             o: Object path of the created pool.
             ao: Object paths of all the block devices in the pool.
       -->
-      <arg name="result" type="(b(oao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified pool. -->
     <method name="DestroyPool">
       <!-- Object path of the pool to destroy. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was destroyed, otherwise false.
         s: UUID of the pool destroyed or a default value if no action was
            taken.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Return JSON representing the internal state of the daemon. The method
@@ -81,55 +81,55 @@
     -->
     <method name="EngineStateReport">
       <!-- JSON output representing the engine state. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Return a list of the Stratis keys in the kernel keyring. -->
     <method name="ListKeys">
       <!-- Array of key descriptions. -->
-      <arg name="result" type="as" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="as" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set a Stratis key in the kernel keyring. -->
     <method name="SetKey">
       <!-- Key description to assign to the set key. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- File descriptor through which to read the key data. -->
-      <arg name="key_fd" type="h" direction="in" />
+      <arg name="key_fd" type="h" direction="in"/>
       <!--
         b: True if the key state was changed, otherwise false.
         b: True if the key was newly set in the keyring. False if a key with the
            given key description already existed.
       -->
-      <arg name="result" type="(bb)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bb)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unlock locked devices belonging to a specified pool. -->
     <method name="UnlockPool">
       <!-- UUID of the pool devices to unlock. -->
-      <arg name="pool_uuid" type="s" direction="in" />
+      <arg name="pool_uuid" type="s" direction="in"/>
       <!-- Method to use to unlock the pool, may be "keyring" or "clevis". -->
-      <arg name="unlock_method" type="s" direction="in" />
+      <arg name="unlock_method" type="s" direction="in"/>
       <!--
         b: True if there was no error, and so the list is meaningful, otherwise
            false.
         as: Array containing the UUIDs of all the devices that were unlocked.
       -->
-      <arg name="result" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unset a key in the kernel keyring. -->
     <method name="UnsetKey">
       <!-- Key description of the key to unset. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- b: True if the key was in the keyring, otherwise false. -->
-      <arg name="result" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       a{sa{sv}}: Mapping of Stratis pool UUIDs to device encryption information.
@@ -138,29 +138,29 @@
           s: Stratis device UUIDs
           v: Encryption information for the device
     -->
-    <property name="LockedPools" type="a{sa{sv}}" access="read" />
+    <property name="LockedPools" type="a{sa{sv}}" access="read"/>
     <!-- stratisd version -->
     <property name="Version" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.Manager.r1">
     <!-- Create a single pool with the specified name and blockdevs. -->
     <method name="CreatePool">
       <!-- Name of the pool. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- Optional redundancy specification for the pool. -->
-      <arg name="redundancy" type="(bq)" direction="in" />
+      <arg name="redundancy" type="(bq)" direction="in"/>
       <!-- Device nodes of devices to form the pool -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!-- Optional key description of the key to use to encrypt the pool -->
-      <arg name="key_desc" type="(bs)" direction="in" />
+      <arg name="key_desc" type="(bs)" direction="in"/>
       <!--
          Optional Clevis information to use to encrypt the pool.
          s: Clevis "pin" specification, "tang" or "tpm".
          s: pin-specific Clevis configuration
       -->
-      <arg name="clevis_info" type="(b(ss))" direction="in" />
+      <arg name="clevis_info" type="(b(ss))" direction="in"/>
       <!--
          b: True if a pool was created, otherwise false.
          (oao): Result of the creation action, default values if no pool
@@ -168,22 +168,22 @@
             o: Object path of the created pool.
             ao: Object paths of all the block devices in the pool.
       -->
-      <arg name="result" type="(b(oao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified pool. -->
     <method name="DestroyPool">
       <!-- Object path of the pool to destroy. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was destroyed, otherwise false.
         s: UUID of the pool destroyed or a default value if no action was
            taken.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Return JSON representing the internal state of the daemon. The method
@@ -192,55 +192,55 @@
     -->
     <method name="EngineStateReport">
       <!-- JSON output representing the engine state. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Return a list of the Stratis keys in the kernel keyring. -->
     <method name="ListKeys">
       <!-- Array of key descriptions. -->
-      <arg name="result" type="as" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="as" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set a Stratis key in the kernel keyring. -->
     <method name="SetKey">
       <!-- Key description to assign to the set key. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- File descriptor through which to read the key data. -->
-      <arg name="key_fd" type="h" direction="in" />
+      <arg name="key_fd" type="h" direction="in"/>
       <!--
         b: True if the key state was changed, otherwise false.
         b: True if the key was newly set in the keyring. False if a key with the
            given key description already existed.
       -->
-      <arg name="result" type="(bb)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bb)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unlock locked devices belonging to a specified pool. -->
     <method name="UnlockPool">
       <!-- UUID of the pool devices to unlock. -->
-      <arg name="pool_uuid" type="s" direction="in" />
+      <arg name="pool_uuid" type="s" direction="in"/>
       <!-- Method to use to unlock the pool, may be "keyring" or "clevis". -->
-      <arg name="unlock_method" type="s" direction="in" />
+      <arg name="unlock_method" type="s" direction="in"/>
       <!--
         b: True if there was no error, and so the list is meaningful, otherwise
            false.
         as: Array containing the UUIDs of all the devices that were unlocked.
       -->
-      <arg name="result" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unset a key in the kernel keyring. -->
     <method name="UnsetKey">
       <!-- Key description of the key to unset. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- b: True if the key was in the keyring, otherwise false. -->
-      <arg name="result" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       a{sa{sv}}: Mapping of Stratis pool UUIDs to device encryption information.
@@ -249,29 +249,29 @@
           s: Stratis device UUIDs
           v: Encryption information for the device
     -->
-    <property name="LockedPools" type="a{sa{sv}}" access="read" />
+    <property name="LockedPools" type="a{sa{sv}}" access="read"/>
     <!-- stratisd version -->
     <property name="Version" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.Manager.r2">
     <!-- Create a single pool with the specified name and blockdevs. -->
     <method name="CreatePool">
       <!-- Name of the pool. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- Optional redundancy specification for the pool. -->
-      <arg name="redundancy" type="(bq)" direction="in" />
+      <arg name="redundancy" type="(bq)" direction="in"/>
       <!-- Device nodes of devices to form the pool -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!-- Optional key description of the key to use to encrypt the pool -->
-      <arg name="key_desc" type="(bs)" direction="in" />
+      <arg name="key_desc" type="(bs)" direction="in"/>
       <!--
          Optional Clevis information to use to encrypt the pool.
          s: Clevis "pin" specification, "tang" or "tpm".
          s: pin-specific Clevis configuration
       -->
-      <arg name="clevis_info" type="(b(ss))" direction="in" />
+      <arg name="clevis_info" type="(b(ss))" direction="in"/>
       <!--
          b: True if a pool was created, otherwise false.
          (oao): Result of the creation action, default values if no pool
@@ -279,22 +279,22 @@
             o: Object path of the created pool.
             ao: Object paths of all the block devices in the pool.
       -->
-      <arg name="result" type="(b(oao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified pool. -->
     <method name="DestroyPool">
       <!-- Object path of the pool to destroy. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was destroyed, otherwise false.
         s: UUID of the pool destroyed or a default value if no action was
            taken.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Return JSON representing the internal state of the daemon. The method
@@ -303,79 +303,79 @@
     -->
     <method name="EngineStateReport">
       <!-- JSON output representing the engine state. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Return a list of the Stratis keys in the kernel keyring. -->
     <method name="ListKeys">
       <!-- Array of key descriptions. -->
-      <arg name="result" type="as" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="as" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Refresh the state of every running pool instance.
       This method is for troubleshooting and debugging only.
     -->
     <method name="RefreshState">
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set a Stratis key in the kernel keyring. -->
     <method name="SetKey">
       <!-- Key description to assign to the set key. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- File descriptor through which to read the key data. -->
-      <arg name="key_fd" type="h" direction="in" />
+      <arg name="key_fd" type="h" direction="in"/>
       <!--
         b: True if the key state was changed, otherwise false.
         b: True if the key was newly set in the keyring. False if a key with the
            given key description already existed.
       -->
-      <arg name="result" type="(bb)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bb)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Start a pool. -->
     <method name="StartPool">
       <!-- UUID of pool to be started. -->
-      <arg name="pool_uuid" type="s" direction="in" />
+      <arg name="pool_uuid" type="s" direction="in"/>
       <!-- Unlock method to use if pool is encrypted
         b: True if an unlock method argument is being specified.
         s: Method to use to unlock the pool, may be "keyring" or "clevis".
       -->
-      <arg name="unlock_method" type="(bs)" direction="in" />
+      <arg name="unlock_method" type="(bs)" direction="in"/>
       <!--
         b: True if the pool was started, otherwise false.
         o: Object path of the started pool.
         ao: Array of object paths of block devices belonging to the pool.
         ao: Array of object paths of filesystems belonging to the pool.
       -->
-      <arg name="result" type="(b(oaoao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oaoao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Stop a running pool. -->
     <method name="StopPool">
       <!-- Object path of pool to be stopped. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was stopped.
         s: UUID of the stopped pool.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unset a key in the kernel keyring. -->
     <method name="UnsetKey">
       <!-- Key description of the key to unset. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- b: True if the key was in the keyring, otherwise false. -->
-      <arg name="result" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       a{sa{sv}}: Mapping of Stratis pool UUIDs to information about the
@@ -408,29 +408,29 @@
 	          devices have inconsistent key information
 	          v = s: error message explaining inconsistency
     -->
-    <property name="StoppedPools" type="a{sa{sv}}" access="read" />
+    <property name="StoppedPools" type="a{sa{sv}}" access="read"/>
     <!-- stratisd version -->
     <property name="Version" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.Manager.r3">
     <!-- Create a single pool with the specified name and blockdevs. -->
     <method name="CreatePool">
       <!-- Name of the pool. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- Optional redundancy specification for the pool. -->
-      <arg name="redundancy" type="(bq)" direction="in" />
+      <arg name="redundancy" type="(bq)" direction="in"/>
       <!-- Device nodes of devices to form the pool -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!-- Optional key description of the key to use to encrypt the pool -->
-      <arg name="key_desc" type="(bs)" direction="in" />
+      <arg name="key_desc" type="(bs)" direction="in"/>
       <!--
          Optional Clevis information to use to encrypt the pool.
          s: Clevis "pin" specification, "tang" or "tpm".
          s: pin-specific Clevis configuration
       -->
-      <arg name="clevis_info" type="(b(ss))" direction="in" />
+      <arg name="clevis_info" type="(b(ss))" direction="in"/>
       <!--
          b: True if a pool was created, otherwise false.
          (oao): Result of the creation action, default values if no pool
@@ -438,22 +438,22 @@
             o: Object path of the created pool.
             ao: Object paths of all the block devices in the pool.
       -->
-      <arg name="result" type="(b(oao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified pool. -->
     <method name="DestroyPool">
       <!-- Object path of the pool to destroy. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was destroyed, otherwise false.
         s: UUID of the pool destroyed or a default value if no action was
            taken.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Return JSON representing the internal state of the daemon. The method
@@ -462,79 +462,79 @@
     -->
     <method name="EngineStateReport">
       <!-- JSON output representing the engine state. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Return a list of the Stratis keys in the kernel keyring. -->
     <method name="ListKeys">
       <!-- Array of key descriptions. -->
-      <arg name="result" type="as" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="as" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Refresh the state of every running pool instance.
       This method is for troubleshooting and debugging only.
     -->
     <method name="RefreshState">
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set a Stratis key in the kernel keyring. -->
     <method name="SetKey">
       <!-- Key description to assign to the set key. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- File descriptor through which to read the key data. -->
-      <arg name="key_fd" type="h" direction="in" />
+      <arg name="key_fd" type="h" direction="in"/>
       <!--
         b: True if the key state was changed, otherwise false.
         b: True if the key was newly set in the keyring. False if a key with the
            given key description already existed.
       -->
-      <arg name="result" type="(bb)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bb)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Start a pool. -->
     <method name="StartPool">
       <!-- UUID of pool to be started. -->
-      <arg name="pool_uuid" type="s" direction="in" />
+      <arg name="pool_uuid" type="s" direction="in"/>
       <!-- Unlock method to use if pool is encrypted
         b: True if an unlock method argument is being specified.
         s: Method to use to unlock the pool, may be "keyring" or "clevis".
       -->
-      <arg name="unlock_method" type="(bs)" direction="in" />
+      <arg name="unlock_method" type="(bs)" direction="in"/>
       <!--
         b: True if the pool was started, otherwise false.
         o: Object path of the started pool.
         ao: Array of object paths of block devices belonging to the pool.
         ao: Array of object paths of filesystems belonging to the pool.
       -->
-      <arg name="result" type="(b(oaoao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oaoao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Stop a running pool. -->
     <method name="StopPool">
       <!-- Object path of pool to be stopped. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was stopped.
         s: UUID of the stopped pool.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unset a key in the kernel keyring. -->
     <method name="UnsetKey">
       <!-- Key description of the key to unset. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- b: True if the key was in the keyring, otherwise false. -->
-      <arg name="result" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       a{sa{sv}}: Mapping of Stratis pool UUIDs to information about the
@@ -567,29 +567,29 @@
 	          devices have inconsistent key information
 	          v = s: error message explaining inconsistency
     -->
-    <property name="StoppedPools" type="a{sa{sv}}" access="read" />
+    <property name="StoppedPools" type="a{sa{sv}}" access="read"/>
     <!-- stratisd version -->
     <property name="Version" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.Manager.r4">
     <!-- Create a single pool with the specified name and blockdevs. -->
     <method name="CreatePool">
       <!-- Name of the pool. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- Optional redundancy specification for the pool. -->
-      <arg name="redundancy" type="(bq)" direction="in" />
+      <arg name="redundancy" type="(bq)" direction="in"/>
       <!-- Device nodes of devices to form the pool -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!-- Optional key description of the key to use to encrypt the pool -->
-      <arg name="key_desc" type="(bs)" direction="in" />
+      <arg name="key_desc" type="(bs)" direction="in"/>
       <!--
          Optional Clevis information to use to encrypt the pool.
          s: Clevis "pin" specification, "tang" or "tpm".
          s: pin-specific Clevis configuration
       -->
-      <arg name="clevis_info" type="(b(ss))" direction="in" />
+      <arg name="clevis_info" type="(b(ss))" direction="in"/>
       <!--
          b: True if a pool was created, otherwise false.
          (oao): Result of the creation action, default values if no pool
@@ -597,22 +597,22 @@
             o: Object path of the created pool.
             ao: Object paths of all the block devices in the pool.
       -->
-      <arg name="result" type="(b(oao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified pool. -->
     <method name="DestroyPool">
       <!-- Object path of the pool to destroy. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was destroyed, otherwise false.
         s: UUID of the pool destroyed or a default value if no action was
            taken.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Return JSON representing the internal state of the daemon. The method
@@ -621,81 +621,81 @@
     -->
     <method name="EngineStateReport">
       <!-- JSON output representing the engine state. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Return a list of the Stratis keys in the kernel keyring. -->
     <method name="ListKeys">
       <!-- Array of key descriptions. -->
-      <arg name="result" type="as" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="as" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Refresh the state of every running pool instance.
       This method is for troubleshooting and debugging only.
     -->
     <method name="RefreshState">
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set a Stratis key in the kernel keyring. -->
     <method name="SetKey">
       <!-- Key description to assign to the set key. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- File descriptor through which to read the key data. -->
-      <arg name="key_fd" type="h" direction="in" />
+      <arg name="key_fd" type="h" direction="in"/>
       <!--
         b: True if the key state was changed, otherwise false.
         b: True if the key was newly set in the keyring. False if a key with the
            given key description already existed.
       -->
-      <arg name="result" type="(bb)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bb)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Start a pool. -->
     <method name="StartPool">
       <!-- identifier of pool to be started -->
-      <arg name="id" type="s" direction="in" />
+      <arg name="id" type="s" direction="in"/>
       <!-- id type: "uuid" or "name" -->
-      <arg name="id_type" type="s" direction="in" />
+      <arg name="id_type" type="s" direction="in"/>
       <!-- Unlock method to use if pool is encrypted
         b: True if an unlock method argument is being specified.
         s: Method to use to unlock the pool, may be "keyring" or "clevis".
       -->
-      <arg name="unlock_method" type="(bs)" direction="in" />
+      <arg name="unlock_method" type="(bs)" direction="in"/>
       <!--
         b: True if the pool was started, otherwise false.
         o: Object path of the started pool.
         ao: Array of object paths of block devices belonging to the pool.
         ao: Array of object paths of filesystems belonging to the pool.
       -->
-      <arg name="result" type="(b(oaoao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oaoao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Stop a running pool. -->
     <method name="StopPool">
       <!-- Object path of pool to be stopped. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was stopped.
         s: UUID of the stopped pool.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unset a key in the kernel keyring. -->
     <method name="UnsetKey">
       <!-- Key description of the key to unset. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- b: True if the key was in the keyring, otherwise false. -->
-      <arg name="result" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       a{sa{sv}}: Mapping of Stratis pool UUIDs to information about the
@@ -728,27 +728,27 @@
 	          devices have inconsistent key information
 	          v = s: error message explaining inconsistency
     -->
-    <property name="StoppedPools" type="a{sa{sv}}" access="read" />
+    <property name="StoppedPools" type="a{sa{sv}}" access="read"/>
     <!-- stratisd version -->
     <property name="Version" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.Manager.r5">
     <!-- Create a single pool with the specified name and blockdevs. -->
     <method name="CreatePool">
       <!-- Name of the pool. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- Device nodes of devices to form the pool -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!-- Optional key description of the key to use to encrypt the pool -->
-      <arg name="key_desc" type="(bs)" direction="in" />
+      <arg name="key_desc" type="(bs)" direction="in"/>
       <!--
          Optional Clevis information to use to encrypt the pool.
          s: Clevis "pin" specification, "tang" or "tpm".
          s: pin-specific Clevis configuration
       -->
-      <arg name="clevis_info" type="(b(ss))" direction="in" />
+      <arg name="clevis_info" type="(b(ss))" direction="in"/>
       <!--
          b: True if a pool was created, otherwise false.
          (oao): Result of the creation action, default values if no pool
@@ -756,22 +756,22 @@
             o: Object path of the created pool.
             ao: Object paths of all the block devices in the pool.
       -->
-      <arg name="result" type="(b(oao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified pool. -->
     <method name="DestroyPool">
       <!-- Object path of the pool to destroy. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was destroyed, otherwise false.
         s: UUID of the pool destroyed or a default value if no action was
            taken.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Return JSON representing the internal state of the daemon. The method
@@ -780,81 +780,81 @@
     -->
     <method name="EngineStateReport">
       <!-- JSON output representing the engine state. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Return a list of the Stratis keys in the kernel keyring. -->
     <method name="ListKeys">
       <!-- Array of key descriptions. -->
-      <arg name="result" type="as" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="as" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Refresh the state of every running pool instance.
       This method is for troubleshooting and debugging only.
     -->
     <method name="RefreshState">
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set a Stratis key in the kernel keyring. -->
     <method name="SetKey">
       <!-- Key description to assign to the set key. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- File descriptor through which to read the key data. -->
-      <arg name="key_fd" type="h" direction="in" />
+      <arg name="key_fd" type="h" direction="in"/>
       <!--
         b: True if the key state was changed, otherwise false.
         b: True if the key was newly set in the keyring. False if a key with the
            given key description already existed.
       -->
-      <arg name="result" type="(bb)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bb)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Start a pool. -->
     <method name="StartPool">
       <!-- identifier of pool to be started -->
-      <arg name="id" type="s" direction="in" />
+      <arg name="id" type="s" direction="in"/>
       <!-- id type: "uuid" or "name" -->
-      <arg name="id_type" type="s" direction="in" />
+      <arg name="id_type" type="s" direction="in"/>
       <!-- Unlock method to use if pool is encrypted
         b: True if an unlock method argument is being specified.
         s: Method to use to unlock the pool, may be "keyring" or "clevis".
       -->
-      <arg name="unlock_method" type="(bs)" direction="in" />
+      <arg name="unlock_method" type="(bs)" direction="in"/>
       <!--
         b: True if the pool was started, otherwise false.
         o: Object path of the started pool.
         ao: Array of object paths of block devices belonging to the pool.
         ao: Array of object paths of filesystems belonging to the pool.
       -->
-      <arg name="result" type="(b(oaoao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oaoao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Stop a running pool. -->
     <method name="StopPool">
       <!-- Object path of pool to be stopped. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was stopped.
         s: UUID of the stopped pool.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unset a key in the kernel keyring. -->
     <method name="UnsetKey">
       <!-- Key description of the key to unset. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- b: True if the key was in the keyring, otherwise false. -->
-      <arg name="result" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       a{sa{sv}}: Mapping of Stratis pool UUIDs to information about the
@@ -887,27 +887,27 @@
 	          devices have inconsistent key information
 	          v = s: error message explaining inconsistency
     -->
-    <property name="StoppedPools" type="a{sa{sv}}" access="read" />
+    <property name="StoppedPools" type="a{sa{sv}}" access="read"/>
     <!-- stratisd version -->
     <property name="Version" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.Manager.r6">
     <!-- Create a single pool with the specified name and blockdevs. -->
     <method name="CreatePool">
       <!-- Name of the pool. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- Device nodes of devices to form the pool -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!-- Optional key description of the key to use to encrypt the pool -->
-      <arg name="key_desc" type="(bs)" direction="in" />
+      <arg name="key_desc" type="(bs)" direction="in"/>
       <!--
          Optional Clevis information to use to encrypt the pool.
          s: Clevis "pin" specification, "tang" or "tpm".
          s: pin-specific Clevis configuration
       -->
-      <arg name="clevis_info" type="(b(ss))" direction="in" />
+      <arg name="clevis_info" type="(b(ss))" direction="in"/>
       <!--
          b: True if a pool was created, otherwise false.
          (oao): Result of the creation action, default values if no pool
@@ -915,22 +915,22 @@
             o: Object path of the created pool.
             ao: Object paths of all the block devices in the pool.
       -->
-      <arg name="result" type="(b(oao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified pool. -->
     <method name="DestroyPool">
       <!-- Object path of the pool to destroy. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was destroyed, otherwise false.
         s: UUID of the pool destroyed or a default value if no action was
            taken.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Return JSON representing the internal state of the daemon. The method
@@ -939,85 +939,85 @@
     -->
     <method name="EngineStateReport">
       <!-- JSON output representing the engine state. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Return a list of the Stratis keys in the kernel keyring. -->
     <method name="ListKeys">
       <!-- Array of key descriptions. -->
-      <arg name="result" type="as" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="as" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Refresh the state of every running pool instance.
       This method is for troubleshooting and debugging only.
     -->
     <method name="RefreshState">
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set a Stratis key in the kernel keyring. -->
     <method name="SetKey">
       <!-- Key description to assign to the set key. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- File descriptor through which to read the key data. -->
-      <arg name="key_fd" type="h" direction="in" />
+      <arg name="key_fd" type="h" direction="in"/>
       <!--
         b: True if the key state was changed, otherwise false.
         b: True if the key was newly set in the keyring. False if a key with the
            given key description already existed.
       -->
-      <arg name="result" type="(bb)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bb)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Start a pool. -->
     <method name="StartPool">
       <!-- identifier of pool to be started -->
-      <arg name="id" type="s" direction="in" />
+      <arg name="id" type="s" direction="in"/>
       <!-- id type: "uuid" or "name" -->
-      <arg name="id_type" type="s" direction="in" />
+      <arg name="id_type" type="s" direction="in"/>
       <!-- Unlock method to use if pool is encrypted
         b: True if an unlock method argument is being specified.
         s: Method to use to unlock the pool, may be "keyring" or "clevis".
       -->
-      <arg name="unlock_method" type="(bs)" direction="in" />
+      <arg name="unlock_method" type="(bs)" direction="in"/>
       <!--
         b: True if the pool was started, otherwise false.
         o: Object path of the started pool.
         ao: Array of object paths of block devices belonging to the pool.
         ao: Array of object paths of filesystems belonging to the pool.
       -->
-      <arg name="result" type="(b(oaoao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oaoao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Stop a running pool. -->
     <method name="StopPool">
       <!-- identifier of pool to be stopped -->
-      <arg name="id" type="s" direction="in" />
+      <arg name="id" type="s" direction="in"/>
       <!-- id type: "uuid" or "name" -->
-      <arg name="id_type" type="s" direction="in" />
+      <arg name="id_type" type="s" direction="in"/>
       <!-- Object path of pool to be stopped. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was stopped.
         s: UUID of the stopped pool.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unset a key in the kernel keyring. -->
     <method name="UnsetKey">
       <!-- Key description of the key to unset. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- b: True if the key was in the keyring, otherwise false. -->
-      <arg name="result" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       a{sa{sv}}: Mapping of Stratis pool UUIDs to information about the
@@ -1050,27 +1050,27 @@
 	          devices have inconsistent key information
 	          v = s: error message explaining inconsistency
     -->
-    <property name="StoppedPools" type="a{sa{sv}}" access="read" />
+    <property name="StoppedPools" type="a{sa{sv}}" access="read"/>
     <!-- stratisd version -->
     <property name="Version" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.Manager.r7">
     <!-- Create a single pool with the specified name and blockdevs. -->
     <method name="CreatePool">
       <!-- Name of the pool. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- Device nodes of devices to form the pool -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!-- Optional key description of the key to use to encrypt the pool -->
-      <arg name="key_desc" type="(bs)" direction="in" />
+      <arg name="key_desc" type="(bs)" direction="in"/>
       <!--
          Optional Clevis information to use to encrypt the pool.
          s: Clevis "pin" specification, "tang" or "tpm".
          s: pin-specific Clevis configuration
       -->
-      <arg name="clevis_info" type="(b(ss))" direction="in" />
+      <arg name="clevis_info" type="(b(ss))" direction="in"/>
       <!--
          b: True if a pool was created, otherwise false.
          (oao): Result of the creation action, default values if no pool
@@ -1078,22 +1078,22 @@
             o: Object path of the created pool.
             ao: Object paths of all the block devices in the pool.
       -->
-      <arg name="result" type="(b(oao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified pool. -->
     <method name="DestroyPool">
       <!-- Object path of the pool to destroy. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was destroyed, otherwise false.
         s: UUID of the pool destroyed or a default value if no action was
            taken.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Return JSON representing the internal state of the daemon. The method
@@ -1102,85 +1102,85 @@
     -->
     <method name="EngineStateReport">
       <!-- JSON output representing the engine state. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Return a list of the Stratis keys in the kernel keyring. -->
     <method name="ListKeys">
       <!-- Array of key descriptions. -->
-      <arg name="result" type="as" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="as" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Refresh the state of every running pool instance.
       This method is for troubleshooting and debugging only.
     -->
     <method name="RefreshState">
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set a Stratis key in the kernel keyring. -->
     <method name="SetKey">
       <!-- Key description to assign to the set key. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- File descriptor through which to read the key data. -->
-      <arg name="key_fd" type="h" direction="in" />
+      <arg name="key_fd" type="h" direction="in"/>
       <!--
         b: True if the key state was changed, otherwise false.
         b: True if the key was newly set in the keyring. False if a key with the
            given key description already existed.
       -->
-      <arg name="result" type="(bb)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bb)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Start a pool. -->
     <method name="StartPool">
       <!-- identifier of pool to be started -->
-      <arg name="id" type="s" direction="in" />
+      <arg name="id" type="s" direction="in"/>
       <!-- id type: "uuid" or "name" -->
-      <arg name="id_type" type="s" direction="in" />
+      <arg name="id_type" type="s" direction="in"/>
       <!-- Unlock method to use if pool is encrypted
         b: True if an unlock method argument is being specified.
         s: Method to use to unlock the pool, may be "keyring" or "clevis".
       -->
-      <arg name="unlock_method" type="(bs)" direction="in" />
+      <arg name="unlock_method" type="(bs)" direction="in"/>
       <!--
         b: True if the pool was started, otherwise false.
         o: Object path of the started pool.
         ao: Array of object paths of block devices belonging to the pool.
         ao: Array of object paths of filesystems belonging to the pool.
       -->
-      <arg name="result" type="(b(oaoao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oaoao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Stop a running pool. -->
     <method name="StopPool">
       <!-- identifier of pool to be stopped -->
-      <arg name="id" type="s" direction="in" />
+      <arg name="id" type="s" direction="in"/>
       <!-- id type: "uuid" or "name" -->
-      <arg name="id_type" type="s" direction="in" />
+      <arg name="id_type" type="s" direction="in"/>
       <!-- Object path of pool to be stopped. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was stopped.
         s: UUID of the stopped pool.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unset a key in the kernel keyring. -->
     <method name="UnsetKey">
       <!-- Key description of the key to unset. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- b: True if the key was in the keyring, otherwise false. -->
-      <arg name="result" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       a{sa{sv}}: Mapping of Stratis pool UUIDs to information about the
@@ -1213,19 +1213,19 @@
 	          devices have inconsistent key information
 	          v = s: error message explaining inconsistency
     -->
-    <property name="StoppedPools" type="a{sa{sv}}" access="read" />
+    <property name="StoppedPools" type="a{sa{sv}}" access="read"/>
     <!-- stratisd version -->
     <property name="Version" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.Manager.r8">
     <!-- Create a single pool with the specified name and blockdevs. -->
     <method name="CreatePool">
       <!-- Name of the pool. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- Device nodes of devices to form the pool -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
          List of key descriptions used to encrypt the pool.
 	 bu: optional token slot at which to bind with this description
@@ -1234,7 +1234,7 @@
 	    u: the token slot value
 	 s: key description
       -->
-      <arg name="key_desc" type="a((bu)s)" direction="in" />
+      <arg name="key_desc" type="a((bu)s)" direction="in"/>
       <!--
          List of Clevis configurations to use to encrypt the pool.
 	 bu: optional token slot at which to bind with this configuration
@@ -1244,7 +1244,7 @@
          s: Clevis "pin" specification, "tang" or "tpm".
          s: pin-specific Clevis configuration
       -->
-      <arg name="clevis_info" type="a((bu)ss)" direction="in" />
+      <arg name="clevis_info" type="a((bu)ss)" direction="in"/>
       <!--
          Amount of space to pre-allocate for dm-integrity journal. If none
 	 specified a default size of 128 MiB will be used.
@@ -1252,7 +1252,7 @@
 	    b: true if size is specified, otherwise false
 	    t: the size of the journal, in bytes
       -->
-      <arg name="journal_size" type="(bt)" direction="in" />
+      <arg name="journal_size" type="(bt)" direction="in"/>
       <!--
          Tag specification determining the amount of space that should be
 	 pre-allocated for a dm-integrity tag. If none a default specification,
@@ -1262,7 +1262,7 @@
 	    s: the tag specification, as a string. Available values are
 	       "0b", "32b", "512b".
       -->
-      <arg name="tag_spec" type="(bs)" direction="in" />
+      <arg name="tag_spec" type="(bs)" direction="in"/>
       <!--
          Whether or not to allocate space for a superblock for dm-integrity.
 	 Space for the superblock is allocated by default.
@@ -1271,7 +1271,7 @@
 	    b: true if specifying to allocate space for superblock, otherwise
 	       false
       -->
-      <arg name="allocate_superblock" type="(bb)" direction="in" />
+      <arg name="allocate_superblock" type="(bb)" direction="in"/>
       <!--
          b: True if a pool was created, otherwise false.
          (oao): Result of the creation action, default values if no pool
@@ -1279,22 +1279,22 @@
             o: Object path of the created pool.
             ao: Object paths of all the block devices in the pool.
       -->
-      <arg name="result" type="(b(oao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified pool. -->
     <method name="DestroyPool">
       <!-- Object path of the pool to destroy. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was destroyed, otherwise false.
         s: UUID of the pool destroyed or a default value if no action was
            taken.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Return JSON representing the internal state of the daemon. The method
@@ -1303,46 +1303,46 @@
     -->
     <method name="EngineStateReport">
       <!-- JSON output representing the engine state. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Return a list of the Stratis keys in the kernel keyring. -->
     <method name="ListKeys">
       <!-- Array of key descriptions. -->
-      <arg name="result" type="as" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="as" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Refresh the state of every running pool instance.
       This method is for troubleshooting and debugging only.
     -->
     <method name="RefreshState">
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set a Stratis key in the kernel keyring. -->
     <method name="SetKey">
       <!-- Key description to assign to the set key. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- File descriptor through which to read the key data. -->
-      <arg name="key_fd" type="h" direction="in" />
+      <arg name="key_fd" type="h" direction="in"/>
       <!--
         b: True if the key state was changed, otherwise false.
         b: True if the key was newly set in the keyring. False if a key with the
            given key description already existed.
       -->
-      <arg name="result" type="(bb)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bb)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Start a pool. -->
     <method name="StartPool">
       <!-- identifier of pool to be started -->
-      <arg name="id" type="s" direction="in" />
+      <arg name="id" type="s" direction="in"/>
       <!-- id type: "uuid" or "name" -->
-      <arg name="id_type" type="s" direction="in" />
+      <arg name="id_type" type="s" direction="in"/>
       <!--
 	Unlock method to use if pool is encrypted
         b: True if an unlock method argument is being specified. If false,
@@ -1352,48 +1352,48 @@
            b: True if a token slot is specified.
 	   u: The token slot.
       -->
-      <arg name="unlock_method" type="(b(bu))" direction="in" />
+      <arg name="unlock_method" type="(b(bu))" direction="in"/>
       <!--
         Optional file descriptor to use to pass password to unlock pool.
         bh: Optional file descriptor
            b: True if the file descriptor is set, otherwise false
 	   h: The file descriptor
       -->
-      <arg name="key_fd" type="(bh)" direction="in" />
+      <arg name="key_fd" type="(bh)" direction="in"/>
       <!--
         b: True if the pool was started, otherwise false.
         o: Object path of the started pool.
         ao: Array of object paths of block devices belonging to the pool.
         ao: Array of object paths of filesystems belonging to the pool.
       -->
-      <arg name="result" type="(b(oaoao))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(b(oaoao))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Stop a running pool. -->
     <method name="StopPool">
       <!-- identifier of pool to be stopped -->
-      <arg name="id" type="s" direction="in" />
+      <arg name="id" type="s" direction="in"/>
       <!-- id type: "uuid" or "name" -->
-      <arg name="id_type" type="s" direction="in" />
+      <arg name="id_type" type="s" direction="in"/>
       <!-- Object path of pool to be stopped. -->
-      <arg name="pool" type="o" direction="in" />
+      <arg name="pool" type="o" direction="in"/>
       <!--
         b: True if the pool was stopped.
         s: UUID of the stopped pool.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unset a key in the kernel keyring. -->
     <method name="UnsetKey">
       <!-- Key description of the key to unset. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- b: True if the key was in the keyring, otherwise false. -->
-      <arg name="result" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       a{sa{sv}}: Mapping of Stratis pool UUIDs to information about the
@@ -1438,10 +1438,10 @@
 	          s: feature name
 	          b: true if the feature is enabled
     -->
-    <property name="StoppedPools" type="a{sa{sv}}" access="read" />
+    <property name="StoppedPools" type="a{sa{sv}}" access="read"/>
     <!-- stratisd version -->
     <property name="Version" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <!--
@@ -1458,11 +1458,11 @@
     -->
     <method name="GetReport">
       <!-- Name of the report. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- s: Report. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.storage.stratis3.Report.r1">
@@ -1472,11 +1472,11 @@
     -->
     <method name="GetReport">
       <!-- Name of the report. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- s: Report. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.storage.stratis3.Report.r2">
@@ -1486,11 +1486,11 @@
     -->
     <method name="GetReport">
       <!-- Name of the report. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- s: Report. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.storage.stratis3.Report.r3">
@@ -1500,11 +1500,11 @@
     -->
     <method name="GetReport">
       <!-- Name of the report. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- s: Report. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.storage.stratis3.Report.r4">
@@ -1514,11 +1514,11 @@
     -->
     <method name="GetReport">
       <!-- Name of the report. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- s: Report. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.storage.stratis3.Report.r5">
@@ -1528,11 +1528,11 @@
     -->
     <method name="GetReport">
       <!-- Name of the report. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- s: Report. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.storage.stratis3.Report.r6">
@@ -1542,11 +1542,11 @@
     -->
     <method name="GetReport">
       <!-- Name of the report. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- s: Report. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.storage.stratis3.Report.r7">
@@ -1556,11 +1556,11 @@
     -->
     <method name="GetReport">
       <!-- Name of the report. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- s: Report. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.storage.stratis3.Report.r8">
@@ -1570,14 +1570,14 @@
     -->
     <method name="GetReport">
       <!-- Name of the report. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!-- s: Report. -->
-      <arg name="result" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
   </interface>
-  <node name="0" />
-  <node name="1" />
-  <node name="2" />
+  <node name="0"/>
+  <node name="1"/>
+  <node name="2"/>
 </node>
diff --git a/docs/dbus/pool.xml b/docs/dbus/pool.xml
index 9a90c59..2fff4c7 100644
--- a/docs/dbus/pool.xml
+++ b/docs/dbus/pool.xml
@@ -1,28 +1,29 @@
+<?xml version="1.0"?>
 <node name="/org/storage/stratis3/0">
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
-      <arg name="xml_data" type="s" direction="out" />
+      <arg name="xml_data" type="s" direction="out"/>
     </method>
   </interface>
   <interface name="org.freedesktop.DBus.Properties">
     <method name="Get">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="property_name" type="s" direction="in" />
-      <arg name="value" type="v" direction="out" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="out"/>
     </method>
     <method name="GetAll">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="props" type="a{sv}" direction="out" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="props" type="a{sv}" direction="out"/>
     </method>
     <method name="Set">
-      <arg name="interface_name" type="s" direction="in" />
-      <arg name="property_name" type="s" direction="in" />
-      <arg name="value" type="v" direction="in" />
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="in"/>
     </method>
     <signal name="PropertiesChanged">
-      <arg name="interface_name" type="s" />
-      <arg name="changed_properties" type="a{sv}" />
-      <arg name="invalidated_properties" type="as" />
+      <arg name="interface_name" type="s"/>
+      <arg name="changed_properties" type="a{sv}"/>
+      <arg name="invalidated_properties" type="as"/>
     </signal>
   </interface>
   <!-- Manages the devices and filesystems in the pool. -->
@@ -30,46 +31,46 @@
     <!-- Add devices to an already initialized cache. -->
     <method name="AddCacheDevs">
       <!-- List of devices to add to the cache. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Add devices to the pool. -->
     <method name="AddDataDevs">
       <!-- List of devices to add. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using Clevis. -->
     <method name="BindClevis">
       <!-- Clevis pin. -->
-      <arg name="pin" type="s" direction="in" />
+      <arg name="pin" type="s" direction="in"/>
       <!-- Pin-specific Clevis configuration information. -->
-      <arg name="json" type="s" direction="in" />
+      <arg name="json" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using a key in the kernel keyring. -->
     <method name="BindKeyring">
       <!-- Description of the key in the kernel keyring. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Create filesystems for the pool. -->
     <method name="CreateFilesystems">
@@ -79,38 +80,38 @@
            s: Name
            bs: Optional size specification
       -->
-      <arg name="specs" type="a(s(bs))" direction="in" />
+      <arg name="specs" type="a(s(bs))" direction="in"/>
       <!--
         b: True if any filesystem was added, otherwise false.
         os: Object paths of newly added filesystems.
       -->
-      <arg name="results" type="(ba(os))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(ba(os))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified filesystems. -->
     <method name="DestroyFilesystems">
       <!-- List of filesystem object paths to destroy. -->
-      <arg name="filesystems" type="ao" direction="in" />
+      <arg name="filesystems" type="ao" direction="in"/>
       <!--
         b: True if any filesystems were destroyed, otherwise false.
         as: UUIDs of destroyed filesystems.
       -->
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Initialize a cache. -->
     <method name="InitCache">
       <!-- List of devices to initialize the cache with. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if the cache was initialized, otherwise false.
         ao: Object paths of devices in the cache.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Regenerate Clevis bindings for devices in the pool using the existing
@@ -122,9 +123,9 @@
         nature of Clevis rebinding generation, this method will always return
         true on success.
       -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Replace the existing key description with the specified one for devices
@@ -132,60 +133,60 @@
     -->
     <method name="RebindKeyring">
       <!-- Key description. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if the specified key description is different. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set the pool name. -->
     <method name="SetName">
       <!-- Name. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the pool or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Make a snapshot of a Stratis filesystem. -->
     <method name="SnapshotFilesystem">
       <!-- Object path of the origin filesystem. -->
-      <arg name="origin" type="o" direction="in" />
+      <arg name="origin" type="o" direction="in"/>
       <!-- Name of the snapshot to be created. -->
-      <arg name="snapshot_name" type="s" direction="in" />
+      <arg name="snapshot_name" type="s" direction="in"/>
       <!--
         b: True if a new filesystem was created, otherwise false.
         o: Object path of the snapshot.
       -->
-      <arg name="result" type="(bo)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bo)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Remove Clevis encryption from the devices in the pool. -->
     <method name="UnbindClevis">
       <!-- True if some Clevis bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unbind a keyring passphrase from the devices in the pool. -->
     <method name="UnbindKeyring">
       <!-- True if some bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Total space allocated from the pool. -->
-    <property name="AllocatedSize" type="s" access="read" />
+    <property name="AllocatedSize" type="s" access="read"/>
     <!--
       Indicates the current capabilities of the pool. Generally the pool has
       full capability, but under certain circumstances stratisd may restrict
       the actions that the pool can perform.
     -->
-    <property name="AvailableActions" type="s" access="read" />
+    <property name="AvailableActions" type="s" access="read"/>
     <!--
       b: True if the Clevis configuration information is consistent for all the
          block devices in the pool, otherwise false.
@@ -195,13 +196,13 @@
 	   s: Clevis pin.
 	   s: Pin-specific Clevis configuration information.
     -->
-    <property name="ClevisInfo" type="(b(b(ss)))" access="read" />
+    <property name="ClevisInfo" type="(b(b(ss)))" access="read"/>
     <!-- True if the pool is encrypted, otherwise false. -->
     <property name="Encrypted" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- True if the pool has a cache, otherwise false. -->
-    <property name="HasCache" type="b" access="read" />
+    <property name="HasCache" type="b" access="read"/>
     <!--
       b: True if the key description information is the same for all the block
          devices in the pool, otherwise false.
@@ -210,65 +211,65 @@
 	    otherwise false.
 	 s: Key description.
     -->
-    <property name="KeyDescription" type="(b(bs))" access="read" />
+    <property name="KeyDescription" type="(b(bs))" access="read"/>
     <!-- Name of the pool. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!--
       Total size of the pool. The sum of the sizes of all the block
       devices in the pool's data tier.
     -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!-- Total space used by the pool for any purpose. -->
-    <property name="TotalPhysicalUsed" type="(bs)" access="read" />
+    <property name="TotalPhysicalUsed" type="(bs)" access="read"/>
     <!-- Stratis UUID of the pool. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.pool.r1">
     <!-- Add devices to an already initialized cache. -->
     <method name="AddCacheDevs">
       <!-- List of devices to add to the cache. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Add devices to the pool. -->
     <method name="AddDataDevs">
       <!-- List of devices to add. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using Clevis. -->
     <method name="BindClevis">
       <!-- Clevis pin. -->
-      <arg name="pin" type="s" direction="in" />
+      <arg name="pin" type="s" direction="in"/>
       <!-- Pin-specific Clevis configuration information. -->
-      <arg name="json" type="s" direction="in" />
+      <arg name="json" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using a key in the kernel keyring. -->
     <method name="BindKeyring">
       <!-- Description of the key in the kernel keyring. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Create filesystems for the pool. -->
     <method name="CreateFilesystems">
@@ -278,38 +279,38 @@
            s: Name
            bs: Optional size specification
       -->
-      <arg name="specs" type="a(s(bs))" direction="in" />
+      <arg name="specs" type="a(s(bs))" direction="in"/>
       <!--
         b: True if any filesystem was added, otherwise false.
         os: Object paths of newly added filesystems.
       -->
-      <arg name="results" type="(ba(os))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(ba(os))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified filesystems. -->
     <method name="DestroyFilesystems">
       <!-- List of filesystem object paths to destroy. -->
-      <arg name="filesystems" type="ao" direction="in" />
+      <arg name="filesystems" type="ao" direction="in"/>
       <!--
         b: True if any filesystems were destroyed, otherwise false.
         as: UUIDs of destroyed filesystems.
       -->
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Initialize a cache. -->
     <method name="InitCache">
       <!-- List of devices to initialize the cache with. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if the cache was initialized, otherwise false.
         ao: Object paths of devices in the cache.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Regenerate Clevis bindings for devices in the pool using the existing
@@ -321,9 +322,9 @@
         nature of Clevis rebinding generation, this method will always return
         true on success.
       -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Replace the existing key description with the specified one for devices
@@ -331,60 +332,60 @@
     -->
     <method name="RebindKeyring">
       <!-- Key description. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if the specified key description is different. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set the pool name. -->
     <method name="SetName">
       <!-- Name. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the pool or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Make a snapshot of a Stratis filesystem. -->
     <method name="SnapshotFilesystem">
       <!-- Object path of the origin filesystem. -->
-      <arg name="origin" type="o" direction="in" />
+      <arg name="origin" type="o" direction="in"/>
       <!-- Name of the snapshot to be created. -->
-      <arg name="snapshot_name" type="s" direction="in" />
+      <arg name="snapshot_name" type="s" direction="in"/>
       <!--
         b: True if a new filesystem was created, otherwise false.
         o: Object path of the snapshot.
       -->
-      <arg name="result" type="(bo)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bo)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Remove Clevis encryption from the devices in the pool. -->
     <method name="UnbindClevis">
       <!-- True if some Clevis bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unbind a keyring passphrase from the devices in the pool. -->
     <method name="UnbindKeyring">
       <!-- True if some bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Total space allocated from the pool. -->
-    <property name="AllocatedSize" type="s" access="read" />
+    <property name="AllocatedSize" type="s" access="read"/>
     <!--
       Indicates the current capabilities of the pool. Generally the pool has
       full capability, but under certain circumstances stratisd may restrict
       the actions that the pool can perform.
     -->
-    <property name="AvailableActions" type="s" access="read" />
+    <property name="AvailableActions" type="s" access="read"/>
     <!--
       b: True if the Clevis configuration information is consistent for all the
          block devices in the pool, otherwise false.
@@ -394,18 +395,18 @@
 	   s: Clevis pin.
 	   s: Pin-specific Clevis configuration information.
     -->
-    <property name="ClevisInfo" type="(b(b(ss)))" access="read" />
+    <property name="ClevisInfo" type="(b(b(ss)))" access="read"/>
     <!-- True if the pool is encrypted, otherwise false. -->
     <property name="Encrypted" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       The maximum number of filesystems that the pool supports. May be
       increased, but not decreased.
     -->
-    <property name="FsLimit" type="t" access="readwrite" />
+    <property name="FsLimit" type="t" access="readwrite"/>
     <!-- True if the pool has a cache, otherwise false. -->
-    <property name="HasCache" type="b" access="read" />
+    <property name="HasCache" type="b" access="read"/>
     <!--
       b: True if the key description information is the same for all the block
          devices in the pool, otherwise false.
@@ -414,84 +415,84 @@
 	    otherwise false.
 	 s: Key description.
     -->
-    <property name="KeyDescription" type="(b(bs))" access="read" />
+    <property name="KeyDescription" type="(b(bs))" access="read"/>
     <!-- Name of the pool. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!--
       If true, then all the space on the pool's devices has been allocated
       to some part of its storage stack. No further allocation, as would be
       necessary to do if increasing the number of filesystems that the pool
       supports, is possible.
     -->
-    <property name="NoAllocSpace" type="b" access="read" />
+    <property name="NoAllocSpace" type="b" access="read"/>
     <!--
       True if the pool allows overprovisioning, otherwise false. Setting this
       property to false will fail if the sum of the logical sizes of the
       filesystems that the pool contains is more than the physical space
       available for them.
     -->
-    <property name="Overprovisioning" type="b" access="readwrite" />
+    <property name="Overprovisioning" type="b" access="readwrite"/>
     <!--
       Total size of the pool. The sum of the sizes of all the block
       devices in the pool's data tier.
     -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!--
       Total space used in the pool. This includes space allocated by Stratis
       for pool management and consequently unavailable for any other purpose,
       as well as all space required by data written to every Stratis
       filesystem on the pool.
     -->
-    <property name="TotalPhysicalUsed" type="(bs)" access="read" />
+    <property name="TotalPhysicalUsed" type="(bs)" access="read"/>
     <!-- Stratis UUID of the pool. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.pool.r2">
     <!-- Add devices to an already initialized cache. -->
     <method name="AddCacheDevs">
       <!-- List of devices to add to the cache. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Add devices to the pool. -->
     <method name="AddDataDevs">
       <!-- List of devices to add. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using Clevis. -->
     <method name="BindClevis">
       <!-- Clevis pin. -->
-      <arg name="pin" type="s" direction="in" />
+      <arg name="pin" type="s" direction="in"/>
       <!-- Pin-specific Clevis configuration information. -->
-      <arg name="json" type="s" direction="in" />
+      <arg name="json" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using a key in the kernel keyring. -->
     <method name="BindKeyring">
       <!-- Description of the key in the kernel keyring. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Create filesystems for the pool. -->
     <method name="CreateFilesystems">
@@ -501,38 +502,38 @@
            s: Name
            bs: Optional size specification
       -->
-      <arg name="specs" type="a(s(bs))" direction="in" />
+      <arg name="specs" type="a(s(bs))" direction="in"/>
       <!--
         b: True if any filesystem was added, otherwise false.
         os: Object paths of newly added filesystems.
       -->
-      <arg name="results" type="(ba(os))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(ba(os))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified filesystems. -->
     <method name="DestroyFilesystems">
       <!-- List of filesystem object paths to destroy. -->
-      <arg name="filesystems" type="ao" direction="in" />
+      <arg name="filesystems" type="ao" direction="in"/>
       <!--
         b: True if any filesystems were destroyed, otherwise false.
         as: UUIDs of destroyed filesystems.
       -->
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Initialize a cache. -->
     <method name="InitCache">
       <!-- List of devices to initialize the cache with. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if the cache was initialized, otherwise false.
         ao: Object paths of devices in the cache.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Regenerate Clevis bindings for devices in the pool using the existing
@@ -544,9 +545,9 @@
         nature of Clevis rebinding generation, this method will always return
         true on success.
       -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Replace the existing key description with the specified one for devices
@@ -554,60 +555,60 @@
     -->
     <method name="RebindKeyring">
       <!-- Key description. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if the specified key description is different. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set the pool name. -->
     <method name="SetName">
       <!-- Name. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the pool or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Make a snapshot of a Stratis filesystem. -->
     <method name="SnapshotFilesystem">
       <!-- Object path of the origin filesystem. -->
-      <arg name="origin" type="o" direction="in" />
+      <arg name="origin" type="o" direction="in"/>
       <!-- Name of the snapshot to be created. -->
-      <arg name="snapshot_name" type="s" direction="in" />
+      <arg name="snapshot_name" type="s" direction="in"/>
       <!--
         b: True if a new filesystem was created, otherwise false.
         o: Object path of the snapshot.
       -->
-      <arg name="result" type="(bo)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bo)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Remove Clevis encryption from the devices in the pool. -->
     <method name="UnbindClevis">
       <!-- True if some Clevis bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unbind a keyring passphrase from the devices in the pool. -->
     <method name="UnbindKeyring">
       <!-- True if some bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Total space allocated from the pool. -->
-    <property name="AllocatedSize" type="s" access="read" />
+    <property name="AllocatedSize" type="s" access="read"/>
     <!--
       Indicates the current capabilities of the pool. Generally the pool has
       full capability, but under certain circumstances stratisd may restrict
       the actions that the pool can perform.
     -->
-    <property name="AvailableActions" type="s" access="read" />
+    <property name="AvailableActions" type="s" access="read"/>
     <!--
       b: True if the Clevis configuration information is consistent for all the
          block devices in the pool, otherwise false.
@@ -617,18 +618,18 @@
 	   s: Clevis pin.
 	   s: Pin-specific Clevis configuration information.
     -->
-    <property name="ClevisInfo" type="(b(b(ss)))" access="read" />
+    <property name="ClevisInfo" type="(b(b(ss)))" access="read"/>
     <!-- True if the pool is encrypted, otherwise false. -->
     <property name="Encrypted" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       The maximum number of filesystems that the pool supports. May be
       increased, but not decreased.
     -->
-    <property name="FsLimit" type="t" access="readwrite" />
+    <property name="FsLimit" type="t" access="readwrite"/>
     <!-- True if the pool has a cache, otherwise false. -->
-    <property name="HasCache" type="b" access="read" />
+    <property name="HasCache" type="b" access="read"/>
     <!--
       b: True if the key description information is the same for all the block
          devices in the pool, otherwise false.
@@ -637,84 +638,84 @@
 	    otherwise false.
 	 s: Key description.
     -->
-    <property name="KeyDescription" type="(b(bs))" access="read" />
+    <property name="KeyDescription" type="(b(bs))" access="read"/>
     <!-- Name of the pool. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!--
       If true, then all the space on the pool's devices has been allocated
       to some part of its storage stack. No further allocation, as would be
       necessary to do if increasing the number of filesystems that the pool
       supports, is possible.
     -->
-    <property name="NoAllocSpace" type="b" access="read" />
+    <property name="NoAllocSpace" type="b" access="read"/>
     <!--
       True if the pool allows overprovisioning, otherwise false. Setting this
       property to false will fail if the sum of the logical sizes of the
       filesystems that the pool contains is more than the physical space
       available for them.
     -->
-    <property name="Overprovisioning" type="b" access="readwrite" />
+    <property name="Overprovisioning" type="b" access="readwrite"/>
     <!--
       Total size of the pool. The sum of the sizes of all the block
       devices in the pool's data tier.
     -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!--
       Total space used in the pool. This includes space allocated by Stratis
       for pool management and consequently unavailable for any other purpose,
       as well as all space required by data written to every Stratis
       filesystem on the pool.
     -->
-    <property name="TotalPhysicalUsed" type="(bs)" access="read" />
+    <property name="TotalPhysicalUsed" type="(bs)" access="read"/>
     <!-- Stratis UUID of the pool. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.pool.r3">
     <!-- Add devices to an already initialized cache. -->
     <method name="AddCacheDevs">
       <!-- List of devices to add to the cache. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Add devices to the pool. -->
     <method name="AddDataDevs">
       <!-- List of devices to add. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using Clevis. -->
     <method name="BindClevis">
       <!-- Clevis pin. -->
-      <arg name="pin" type="s" direction="in" />
+      <arg name="pin" type="s" direction="in"/>
       <!-- Pin-specific Clevis configuration information. -->
-      <arg name="json" type="s" direction="in" />
+      <arg name="json" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using a key in the kernel keyring. -->
     <method name="BindKeyring">
       <!-- Description of the key in the kernel keyring. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Create filesystems for the pool. -->
     <method name="CreateFilesystems">
@@ -724,46 +725,46 @@
            s: Name
            bs: Optional size specification
       -->
-      <arg name="specs" type="a(s(bs))" direction="in" />
+      <arg name="specs" type="a(s(bs))" direction="in"/>
       <!--
         b: True if any filesystem was added, otherwise false.
         os: Object paths of newly added filesystems.
       -->
-      <arg name="results" type="(ba(os))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(ba(os))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified filesystems. -->
     <method name="DestroyFilesystems">
       <!-- List of filesystem object paths to destroy. -->
-      <arg name="filesystems" type="ao" direction="in" />
+      <arg name="filesystems" type="ao" direction="in"/>
       <!--
         b: True if any filesystems were destroyed, otherwise false.
         as: UUIDs of destroyed filesystems.
       -->
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Extend the available size of a pool. -->
     <method name="GrowPhysicalDevice">
       <!-- UUID of data device belonging to pool to extend. -->
-      <arg name="dev" type="s" direction="in" />
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="dev" type="s" direction="in"/>
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Initialize a cache. -->
     <method name="InitCache">
       <!-- List of devices to initialize the cache with. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if the cache was initialized, otherwise false.
         ao: Object paths of devices in the cache.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Regenerate Clevis bindings for devices in the pool using the existing
@@ -775,9 +776,9 @@
         nature of Clevis rebinding generation, this method will always return
         true on success.
       -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Replace the existing key description with the specified one for devices
@@ -785,60 +786,60 @@
     -->
     <method name="RebindKeyring">
       <!-- Key description. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if the specified key description is different. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set the pool name. -->
     <method name="SetName">
       <!-- Name. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the pool or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Make a snapshot of a Stratis filesystem. -->
     <method name="SnapshotFilesystem">
       <!-- Object path of the origin filesystem. -->
-      <arg name="origin" type="o" direction="in" />
+      <arg name="origin" type="o" direction="in"/>
       <!-- Name of the snapshot to be created. -->
-      <arg name="snapshot_name" type="s" direction="in" />
+      <arg name="snapshot_name" type="s" direction="in"/>
       <!--
         b: True if a new filesystem was created, otherwise false.
         o: Object path of the snapshot.
       -->
-      <arg name="result" type="(bo)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bo)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Remove Clevis encryption from the devices in the pool. -->
     <method name="UnbindClevis">
       <!-- True if some Clevis bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unbind a keyring passphrase from the devices in the pool. -->
     <method name="UnbindKeyring">
       <!-- True if some bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Total space allocated from the pool. -->
-    <property name="AllocatedSize" type="s" access="read" />
+    <property name="AllocatedSize" type="s" access="read"/>
     <!--
       Indicates the current capabilities of the pool. Generally the pool has
       full capability, but under certain circumstances stratisd may restrict
       the actions that the pool can perform.
     -->
-    <property name="AvailableActions" type="s" access="read" />
+    <property name="AvailableActions" type="s" access="read"/>
     <!--
       b: True if the Clevis configuration information is consistent for all the
          block devices in the pool, otherwise false.
@@ -848,18 +849,18 @@
 	   s: Clevis pin.
 	   s: Pin-specific Clevis configuration information.
     -->
-    <property name="ClevisInfo" type="(b(b(ss)))" access="read" />
+    <property name="ClevisInfo" type="(b(b(ss)))" access="read"/>
     <!-- True if the pool is encrypted, otherwise false. -->
     <property name="Encrypted" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       The maximum number of filesystems that the pool supports. May be
       increased, but not decreased.
     -->
-    <property name="FsLimit" type="t" access="readwrite" />
+    <property name="FsLimit" type="t" access="readwrite"/>
     <!-- True if the pool has a cache, otherwise false. -->
-    <property name="HasCache" type="b" access="read" />
+    <property name="HasCache" type="b" access="read"/>
     <!--
       b: True if the key description information is the same for all the block
          devices in the pool, otherwise false.
@@ -868,84 +869,84 @@
 	    otherwise false.
 	 s: Key description.
     -->
-    <property name="KeyDescription" type="(b(bs))" access="read" />
+    <property name="KeyDescription" type="(b(bs))" access="read"/>
     <!-- Name of the pool. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!--
       If true, then all the space on the pool's devices has been allocated
       to some part of its storage stack. No further allocation, as would be
       necessary to do if increasing the number of filesystems that the pool
       supports, is possible.
     -->
-    <property name="NoAllocSpace" type="b" access="read" />
+    <property name="NoAllocSpace" type="b" access="read"/>
     <!--
       True if the pool allows overprovisioning, otherwise false. Setting this
       property to false will fail if the sum of the logical sizes of the
       filesystems that the pool contains is more than the physical space
       available for them.
     -->
-    <property name="Overprovisioning" type="b" access="readwrite" />
+    <property name="Overprovisioning" type="b" access="readwrite"/>
     <!--
       Total size of the pool. The sum of the sizes of all the block
       devices in the pool's data tier.
     -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!--
       Total space used in the pool. This includes space allocated by Stratis
       for pool management and consequently unavailable for any other purpose,
       as well as all space required by data written to every Stratis
       filesystem on the pool.
     -->
-    <property name="TotalPhysicalUsed" type="(bs)" access="read" />
+    <property name="TotalPhysicalUsed" type="(bs)" access="read"/>
     <!-- Stratis UUID of the pool. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.pool.r4">
     <!-- Add devices to an already initialized cache. -->
     <method name="AddCacheDevs">
       <!-- List of devices to add to the cache. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Add devices to the pool. -->
     <method name="AddDataDevs">
       <!-- List of devices to add. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using Clevis. -->
     <method name="BindClevis">
       <!-- Clevis pin. -->
-      <arg name="pin" type="s" direction="in" />
+      <arg name="pin" type="s" direction="in"/>
       <!-- Pin-specific Clevis configuration information. -->
-      <arg name="json" type="s" direction="in" />
+      <arg name="json" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using a key in the kernel keyring. -->
     <method name="BindKeyring">
       <!-- Description of the key in the kernel keyring. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Create filesystems for the pool. -->
     <method name="CreateFilesystems">
@@ -955,46 +956,46 @@
            s: Name
            bs: Optional size specification
       -->
-      <arg name="specs" type="a(s(bs))" direction="in" />
+      <arg name="specs" type="a(s(bs))" direction="in"/>
       <!--
         b: True if any filesystem was added, otherwise false.
         os: Object paths of newly added filesystems.
       -->
-      <arg name="results" type="(ba(os))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(ba(os))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified filesystems. -->
     <method name="DestroyFilesystems">
       <!-- List of filesystem object paths to destroy. -->
-      <arg name="filesystems" type="ao" direction="in" />
+      <arg name="filesystems" type="ao" direction="in"/>
       <!--
         b: True if any filesystems were destroyed, otherwise false.
         as: UUIDs of destroyed filesystems.
       -->
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Extend the available size of a pool. -->
     <method name="GrowPhysicalDevice">
       <!-- UUID of data device belonging to pool to extend. -->
-      <arg name="dev" type="s" direction="in" />
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="dev" type="s" direction="in"/>
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Initialize a cache. -->
     <method name="InitCache">
       <!-- List of devices to initialize the cache with. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if the cache was initialized, otherwise false.
         ao: Object paths of devices in the cache.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Regenerate Clevis bindings for devices in the pool using the existing
@@ -1006,9 +1007,9 @@
         nature of Clevis rebinding generation, this method will always return
         true on success.
       -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Replace the existing key description with the specified one for devices
@@ -1016,60 +1017,60 @@
     -->
     <method name="RebindKeyring">
       <!-- Key description. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if the specified key description is different. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set the pool name. -->
     <method name="SetName">
       <!-- Name. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the pool or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Make a snapshot of a Stratis filesystem. -->
     <method name="SnapshotFilesystem">
       <!-- Object path of the origin filesystem. -->
-      <arg name="origin" type="o" direction="in" />
+      <arg name="origin" type="o" direction="in"/>
       <!-- Name of the snapshot to be created. -->
-      <arg name="snapshot_name" type="s" direction="in" />
+      <arg name="snapshot_name" type="s" direction="in"/>
       <!--
         b: True if a new filesystem was created, otherwise false.
         o: Object path of the snapshot.
       -->
-      <arg name="result" type="(bo)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bo)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Remove Clevis encryption from the devices in the pool. -->
     <method name="UnbindClevis">
       <!-- True if some Clevis bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unbind a keyring passphrase from the devices in the pool. -->
     <method name="UnbindKeyring">
       <!-- True if some bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Total space allocated from the pool. -->
-    <property name="AllocatedSize" type="s" access="read" />
+    <property name="AllocatedSize" type="s" access="read"/>
     <!--
       Indicates the current capabilities of the pool. Generally the pool has
       full capability, but under certain circumstances stratisd may restrict
       the actions that the pool can perform.
     -->
-    <property name="AvailableActions" type="s" access="read" />
+    <property name="AvailableActions" type="s" access="read"/>
     <!--
       b: True if the Clevis configuration information is consistent for all the
          block devices in the pool, otherwise false.
@@ -1079,18 +1080,18 @@
 	   s: Clevis pin.
 	   s: Pin-specific Clevis configuration information.
     -->
-    <property name="ClevisInfo" type="(b(b(ss)))" access="read" />
+    <property name="ClevisInfo" type="(b(b(ss)))" access="read"/>
     <!-- True if the pool is encrypted, otherwise false. -->
     <property name="Encrypted" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       The maximum number of filesystems that the pool supports. May be
       increased, but not decreased.
     -->
-    <property name="FsLimit" type="t" access="readwrite" />
+    <property name="FsLimit" type="t" access="readwrite"/>
     <!-- True if the pool has a cache, otherwise false. -->
-    <property name="HasCache" type="b" access="read" />
+    <property name="HasCache" type="b" access="read"/>
     <!--
       b: True if the key description information is the same for all the block
          devices in the pool, otherwise false.
@@ -1099,84 +1100,84 @@
 	    otherwise false.
 	 s: Key description.
     -->
-    <property name="KeyDescription" type="(b(bs))" access="read" />
+    <property name="KeyDescription" type="(b(bs))" access="read"/>
     <!-- Name of the pool. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!--
       If true, then all the space on the pool's devices has been allocated
       to some part of its storage stack. No further allocation, as would be
       necessary to do if increasing the number of filesystems that the pool
       supports, is possible.
     -->
-    <property name="NoAllocSpace" type="b" access="read" />
+    <property name="NoAllocSpace" type="b" access="read"/>
     <!--
       True if the pool allows overprovisioning, otherwise false. Setting this
       property to false will fail if the sum of the logical sizes of the
       filesystems that the pool contains is more than the physical space
       available for them.
     -->
-    <property name="Overprovisioning" type="b" access="readwrite" />
+    <property name="Overprovisioning" type="b" access="readwrite"/>
     <!--
       Total size of the pool. The sum of the sizes of all the block
       devices in the pool's data tier.
     -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!--
       Total space used in the pool. This includes space allocated by Stratis
       for pool management and consequently unavailable for any other purpose,
       as well as all space required by data written to every Stratis
       filesystem on the pool.
     -->
-    <property name="TotalPhysicalUsed" type="(bs)" access="read" />
+    <property name="TotalPhysicalUsed" type="(bs)" access="read"/>
     <!-- Stratis UUID of the pool. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.pool.r5">
     <!-- Add devices to an already initialized cache. -->
     <method name="AddCacheDevs">
       <!-- List of devices to add to the cache. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Add devices to the pool. -->
     <method name="AddDataDevs">
       <!-- List of devices to add. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using Clevis. -->
     <method name="BindClevis">
       <!-- Clevis pin. -->
-      <arg name="pin" type="s" direction="in" />
+      <arg name="pin" type="s" direction="in"/>
       <!-- Pin-specific Clevis configuration information. -->
-      <arg name="json" type="s" direction="in" />
+      <arg name="json" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using a key in the kernel keyring. -->
     <method name="BindKeyring">
       <!-- Description of the key in the kernel keyring. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Create filesystems for the pool. -->
     <method name="CreateFilesystems">
@@ -1186,46 +1187,46 @@
            s: Name
            bs: Optional size specification
       -->
-      <arg name="specs" type="a(s(bs))" direction="in" />
+      <arg name="specs" type="a(s(bs))" direction="in"/>
       <!--
         b: True if any filesystem was added, otherwise false.
         os: Object paths of newly added filesystems.
       -->
-      <arg name="results" type="(ba(os))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(ba(os))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified filesystems. -->
     <method name="DestroyFilesystems">
       <!-- List of filesystem object paths to destroy. -->
-      <arg name="filesystems" type="ao" direction="in" />
+      <arg name="filesystems" type="ao" direction="in"/>
       <!--
         b: True if any filesystems were destroyed, otherwise false.
         as: UUIDs of destroyed filesystems.
       -->
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Extend the available size of a pool. -->
     <method name="GrowPhysicalDevice">
       <!-- UUID of data device belonging to pool to extend. -->
-      <arg name="dev" type="s" direction="in" />
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="dev" type="s" direction="in"/>
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Initialize a cache. -->
     <method name="InitCache">
       <!-- List of devices to initialize the cache with. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if the cache was initialized, otherwise false.
         ao: Object paths of devices in the cache.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Regenerate Clevis bindings for devices in the pool using the existing
@@ -1237,9 +1238,9 @@
         nature of Clevis rebinding generation, this method will always return
         true on success.
       -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Replace the existing key description with the specified one for devices
@@ -1247,60 +1248,60 @@
     -->
     <method name="RebindKeyring">
       <!-- Key description. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if the specified key description is different. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set the pool name. -->
     <method name="SetName">
       <!-- Name. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the pool or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Make a snapshot of a Stratis filesystem. -->
     <method name="SnapshotFilesystem">
       <!-- Object path of the origin filesystem. -->
-      <arg name="origin" type="o" direction="in" />
+      <arg name="origin" type="o" direction="in"/>
       <!-- Name of the snapshot to be created. -->
-      <arg name="snapshot_name" type="s" direction="in" />
+      <arg name="snapshot_name" type="s" direction="in"/>
       <!--
         b: True if a new filesystem was created, otherwise false.
         o: Object path of the snapshot.
       -->
-      <arg name="result" type="(bo)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bo)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Remove Clevis encryption from the devices in the pool. -->
     <method name="UnbindClevis">
       <!-- True if some Clevis bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unbind a keyring passphrase from the devices in the pool. -->
     <method name="UnbindKeyring">
       <!-- True if some bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Total space allocated from the pool. -->
-    <property name="AllocatedSize" type="s" access="read" />
+    <property name="AllocatedSize" type="s" access="read"/>
     <!--
       Indicates the current capabilities of the pool. Generally the pool has
       full capability, but under certain circumstances stratisd may restrict
       the actions that the pool can perform.
     -->
-    <property name="AvailableActions" type="s" access="read" />
+    <property name="AvailableActions" type="s" access="read"/>
     <!--
       b: True if the Clevis configuration information is consistent for all the
          block devices in the pool, otherwise false.
@@ -1310,18 +1311,18 @@
 	   s: Clevis pin.
 	   s: Pin-specific Clevis configuration information.
     -->
-    <property name="ClevisInfo" type="(b(b(ss)))" access="read" />
+    <property name="ClevisInfo" type="(b(b(ss)))" access="read"/>
     <!-- True if the pool is encrypted, otherwise false. -->
     <property name="Encrypted" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       The maximum number of filesystems that the pool supports. May be
       increased, but not decreased.
     -->
-    <property name="FsLimit" type="t" access="readwrite" />
+    <property name="FsLimit" type="t" access="readwrite"/>
     <!-- True if the pool has a cache, otherwise false. -->
-    <property name="HasCache" type="b" access="read" />
+    <property name="HasCache" type="b" access="read"/>
     <!--
       b: True if the key description information is the same for all the block
          devices in the pool, otherwise false.
@@ -1330,84 +1331,84 @@
 	    otherwise false.
 	 s: Key description.
     -->
-    <property name="KeyDescription" type="(b(bs))" access="read" />
+    <property name="KeyDescription" type="(b(bs))" access="read"/>
     <!-- Name of the pool. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!--
       If true, then all the space on the pool's devices has been allocated
       to some part of its storage stack. No further allocation, as would be
       necessary to do if increasing the number of filesystems that the pool
       supports, is possible.
     -->
-    <property name="NoAllocSpace" type="b" access="read" />
+    <property name="NoAllocSpace" type="b" access="read"/>
     <!--
       True if the pool allows overprovisioning, otherwise false. Setting this
       property to false will fail if the sum of the logical sizes of the
       filesystems that the pool contains is more than the physical space
       available for them.
     -->
-    <property name="Overprovisioning" type="b" access="readwrite" />
+    <property name="Overprovisioning" type="b" access="readwrite"/>
     <!--
       Total size of the pool. The sum of the sizes of all the block
       devices in the pool's data tier.
     -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!--
       Total space used in the pool. This includes space allocated by Stratis
       for pool management and consequently unavailable for any other purpose,
       as well as all space required by data written to every Stratis
       filesystem on the pool.
     -->
-    <property name="TotalPhysicalUsed" type="(bs)" access="read" />
+    <property name="TotalPhysicalUsed" type="(bs)" access="read"/>
     <!-- Stratis UUID of the pool. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.pool.r6">
     <!-- Add devices to an already initialized cache. -->
     <method name="AddCacheDevs">
       <!-- List of devices to add to the cache. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Add devices to the pool. -->
     <method name="AddDataDevs">
       <!-- List of devices to add. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using Clevis. -->
     <method name="BindClevis">
       <!-- Clevis pin. -->
-      <arg name="pin" type="s" direction="in" />
+      <arg name="pin" type="s" direction="in"/>
       <!-- Pin-specific Clevis configuration information. -->
-      <arg name="json" type="s" direction="in" />
+      <arg name="json" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using a key in the kernel keyring. -->
     <method name="BindKeyring">
       <!-- Description of the key in the kernel keyring. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Create filesystems for the pool. -->
     <method name="CreateFilesystems">
@@ -1418,46 +1419,46 @@
            bs: Optional size specification
            bs: Optional size limit specification
       -->
-      <arg name="specs" type="a(s(bs)(bs))" direction="in" />
+      <arg name="specs" type="a(s(bs)(bs))" direction="in"/>
       <!--
         b: True if any filesystem was added, otherwise false.
         os: Object paths of newly added filesystems.
       -->
-      <arg name="results" type="(ba(os))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(ba(os))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified filesystems. -->
     <method name="DestroyFilesystems">
       <!-- List of filesystem object paths to destroy. -->
-      <arg name="filesystems" type="ao" direction="in" />
+      <arg name="filesystems" type="ao" direction="in"/>
       <!--
         b: True if any filesystems were destroyed, otherwise false.
         as: UUIDs of destroyed filesystems.
       -->
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Extend the available size of a pool. -->
     <method name="GrowPhysicalDevice">
       <!-- UUID of data device belonging to pool to extend. -->
-      <arg name="dev" type="s" direction="in" />
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="dev" type="s" direction="in"/>
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Initialize a cache. -->
     <method name="InitCache">
       <!-- List of devices to initialize the cache with. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if the cache was initialized, otherwise false.
         ao: Object paths of devices in the cache.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Regenerate Clevis bindings for devices in the pool using the existing
@@ -1469,9 +1470,9 @@
         nature of Clevis rebinding generation, this method will always return
         true on success.
       -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Replace the existing key description with the specified one for devices
@@ -1479,60 +1480,60 @@
     -->
     <method name="RebindKeyring">
       <!-- Key description. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if the specified key description is different. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set the pool name. -->
     <method name="SetName">
       <!-- Name. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the pool or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Make a snapshot of a Stratis filesystem. -->
     <method name="SnapshotFilesystem">
       <!-- Object path of the origin filesystem. -->
-      <arg name="origin" type="o" direction="in" />
+      <arg name="origin" type="o" direction="in"/>
       <!-- Name of the snapshot to be created. -->
-      <arg name="snapshot_name" type="s" direction="in" />
+      <arg name="snapshot_name" type="s" direction="in"/>
       <!--
         b: True if a new filesystem was created, otherwise false.
         o: Object path of the snapshot.
       -->
-      <arg name="result" type="(bo)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bo)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Remove Clevis encryption from the devices in the pool. -->
     <method name="UnbindClevis">
       <!-- True if some Clevis bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unbind a keyring passphrase from the devices in the pool. -->
     <method name="UnbindKeyring">
       <!-- True if some bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Total space allocated from the pool. -->
-    <property name="AllocatedSize" type="s" access="read" />
+    <property name="AllocatedSize" type="s" access="read"/>
     <!--
       Indicates the current capabilities of the pool. Generally the pool has
       full capability, but under certain circumstances stratisd may restrict
       the actions that the pool can perform.
     -->
-    <property name="AvailableActions" type="s" access="read" />
+    <property name="AvailableActions" type="s" access="read"/>
     <!--
       b: True if the Clevis configuration information is consistent for all the
          block devices in the pool, otherwise false.
@@ -1542,18 +1543,18 @@
 	   s: Clevis pin.
 	   s: Pin-specific Clevis configuration information.
     -->
-    <property name="ClevisInfo" type="(b(b(ss)))" access="read" />
+    <property name="ClevisInfo" type="(b(b(ss)))" access="read"/>
     <!-- True if the pool is encrypted, otherwise false. -->
     <property name="Encrypted" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       The maximum number of filesystems that the pool supports. May be
       increased, but not decreased.
     -->
-    <property name="FsLimit" type="t" access="readwrite" />
+    <property name="FsLimit" type="t" access="readwrite"/>
     <!-- True if the pool has a cache, otherwise false. -->
-    <property name="HasCache" type="b" access="read" />
+    <property name="HasCache" type="b" access="read"/>
     <!--
       b: True if the key description information is the same for all the block
          devices in the pool, otherwise false.
@@ -1562,84 +1563,84 @@
 	    otherwise false.
 	 s: Key description.
     -->
-    <property name="KeyDescription" type="(b(bs))" access="read" />
+    <property name="KeyDescription" type="(b(bs))" access="read"/>
     <!-- Name of the pool. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!--
       If true, then all the space on the pool's devices has been allocated
       to some part of its storage stack. No further allocation, as would be
       necessary to do if increasing the number of filesystems that the pool
       supports, is possible.
     -->
-    <property name="NoAllocSpace" type="b" access="read" />
+    <property name="NoAllocSpace" type="b" access="read"/>
     <!--
       True if the pool allows overprovisioning, otherwise false. Setting this
       property to false will fail if the sum of the logical sizes of the
       filesystems that the pool contains is more than the physical space
       available for them.
     -->
-    <property name="Overprovisioning" type="b" access="readwrite" />
+    <property name="Overprovisioning" type="b" access="readwrite"/>
     <!--
       Total size of the pool. The sum of the sizes of all the block
       devices in the pool's data tier.
     -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!--
       Total space used in the pool. This includes space allocated by Stratis
       for pool management and consequently unavailable for any other purpose,
       as well as all space required by data written to every Stratis
       filesystem on the pool.
     -->
-    <property name="TotalPhysicalUsed" type="(bs)" access="read" />
+    <property name="TotalPhysicalUsed" type="(bs)" access="read"/>
     <!-- Stratis UUID of the pool. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.pool.r7">
     <!-- Add devices to an already initialized cache. -->
     <method name="AddCacheDevs">
       <!-- List of devices to add to the cache. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Add devices to the pool. -->
     <method name="AddDataDevs">
       <!-- List of devices to add. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using Clevis. -->
     <method name="BindClevis">
       <!-- Clevis pin. -->
-      <arg name="pin" type="s" direction="in" />
+      <arg name="pin" type="s" direction="in"/>
       <!-- Pin-specific Clevis configuration information. -->
-      <arg name="json" type="s" direction="in" />
+      <arg name="json" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using a key in the kernel keyring. -->
     <method name="BindKeyring">
       <!-- Description of the key in the kernel keyring. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Create filesystems for the pool. -->
     <method name="CreateFilesystems">
@@ -1650,26 +1651,26 @@
            bs: Optional size specification
            bs: Optional size limit specification
       -->
-      <arg name="specs" type="a(s(bs)(bs))" direction="in" />
+      <arg name="specs" type="a(s(bs)(bs))" direction="in"/>
       <!--
         b: True if any filesystem was added, otherwise false.
         os: Object paths of newly added filesystems.
       -->
-      <arg name="results" type="(ba(os))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(ba(os))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified filesystems. -->
     <method name="DestroyFilesystems">
       <!-- List of filesystem object paths to destroy. -->
-      <arg name="filesystems" type="ao" direction="in" />
+      <arg name="filesystems" type="ao" direction="in"/>
       <!--
         b: True if any filesystems were destroyed, otherwise false.
         as: UUIDs of destroyed filesystems.
       -->
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Get filesystem metadata. -->
     <method name="FilesystemMetadata">
@@ -1679,36 +1680,36 @@
          b: True if the filesystem name is specified, otherwise false.
          s: Filesystem name.
       -->
-      <arg name="fs_name" type="(bs)" direction="in" />
+      <arg name="fs_name" type="(bs)" direction="in"/>
       <!--
          True if the metadata that would be written if it were written now,
          false if the metadata that is currently on disk.
       -->
-      <arg name="current" type="b" direction="in" />
+      <arg name="current" type="b" direction="in"/>
       <!-- Filesystem metadata. -->
-      <arg name="results" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Extend the available size of a pool. -->
     <method name="GrowPhysicalDevice">
       <!-- UUID of data device belonging to pool to extend. -->
-      <arg name="dev" type="s" direction="in" />
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="dev" type="s" direction="in"/>
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Initialize a cache. -->
     <method name="InitCache">
       <!-- List of devices to initialize the cache with. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if the cache was initialized, otherwise false.
         ao: Object paths of devices in the cache.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Get pool metadata. -->
     <method name="Metadata">
@@ -1716,11 +1717,11 @@
          True if the metadata that would be written if it were written now,
          false if the metadata that is currently on disk.
       -->
-      <arg name="current" type="b" direction="in" />
+      <arg name="current" type="b" direction="in"/>
       <!-- Pool metadata. -->
-      <arg name="results" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Regenerate Clevis bindings for devices in the pool using the existing
@@ -1732,9 +1733,9 @@
         nature of Clevis rebinding generation, this method will always return
         true on success.
       -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Replace the existing key description with the specified one for devices
@@ -1742,60 +1743,60 @@
     -->
     <method name="RebindKeyring">
       <!-- Key description. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!-- True if the specified key description is different. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set the pool name. -->
     <method name="SetName">
       <!-- Name. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the pool or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Make a snapshot of a Stratis filesystem. -->
     <method name="SnapshotFilesystem">
       <!-- Object path of the origin filesystem. -->
-      <arg name="origin" type="o" direction="in" />
+      <arg name="origin" type="o" direction="in"/>
       <!-- Name of the snapshot to be created. -->
-      <arg name="snapshot_name" type="s" direction="in" />
+      <arg name="snapshot_name" type="s" direction="in"/>
       <!--
         b: True if a new filesystem was created, otherwise false.
         o: Object path of the snapshot.
       -->
-      <arg name="result" type="(bo)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bo)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Remove Clevis encryption from the devices in the pool. -->
     <method name="UnbindClevis">
       <!-- True if some Clevis bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unbind a keyring passphrase from the devices in the pool. -->
     <method name="UnbindKeyring">
       <!-- True if some bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Total space allocated from the pool. -->
-    <property name="AllocatedSize" type="s" access="read" />
+    <property name="AllocatedSize" type="s" access="read"/>
     <!--
       Indicates the current capabilities of the pool. Generally the pool has
       full capability, but under certain circumstances stratisd may restrict
       the actions that the pool can perform.
     -->
-    <property name="AvailableActions" type="s" access="read" />
+    <property name="AvailableActions" type="s" access="read"/>
     <!--
       b: True if the Clevis configuration information is consistent for all the
          block devices in the pool, otherwise false.
@@ -1805,18 +1806,18 @@
 	   s: Clevis pin.
 	   s: Pin-specific Clevis configuration information.
     -->
-    <property name="ClevisInfo" type="(b(b(ss)))" access="read" />
+    <property name="ClevisInfo" type="(b(b(ss)))" access="read"/>
     <!-- True if the pool is encrypted, otherwise false. -->
     <property name="Encrypted" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       The maximum number of filesystems that the pool supports. May be
       increased, but not decreased.
     -->
-    <property name="FsLimit" type="t" access="readwrite" />
+    <property name="FsLimit" type="t" access="readwrite"/>
     <!-- True if the pool has a cache, otherwise false. -->
-    <property name="HasCache" type="b" access="read" />
+    <property name="HasCache" type="b" access="read"/>
     <!--
       b: True if the key description information is the same for all the block
          devices in the pool, otherwise false.
@@ -1825,94 +1826,94 @@
 	    otherwise false.
 	 s: Key description.
     -->
-    <property name="KeyDescription" type="(b(bs))" access="read" />
+    <property name="KeyDescription" type="(b(bs))" access="read"/>
     <!-- Name of the pool. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!--
       If true, then all the space on the pool's devices has been allocated
       to some part of its storage stack. No further allocation, as would be
       necessary to do if increasing the number of filesystems that the pool
       supports, is possible.
     -->
-    <property name="NoAllocSpace" type="b" access="read" />
+    <property name="NoAllocSpace" type="b" access="read"/>
     <!--
       True if the pool allows overprovisioning, otherwise false. Setting this
       property to false will fail if the sum of the logical sizes of the
       filesystems that the pool contains is more than the physical space
       available for them.
     -->
-    <property name="Overprovisioning" type="b" access="readwrite" />
+    <property name="Overprovisioning" type="b" access="readwrite"/>
     <!--
       Total size of the pool. The sum of the sizes of all the block
       devices in the pool's data tier.
     -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!--
       Total space used in the pool. This includes space allocated by Stratis
       for pool management and consequently unavailable for any other purpose,
       as well as all space required by data written to every Stratis
       filesystem on the pool.
     -->
-    <property name="TotalPhysicalUsed" type="(bs)" access="read" />
+    <property name="TotalPhysicalUsed" type="(bs)" access="read"/>
     <!-- Stratis UUID of the pool. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
   <interface name="org.storage.stratis3.pool.r8">
     <!-- Add devices to an already initialized cache. -->
     <method name="AddCacheDevs">
       <!-- List of devices to add to the cache. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Add devices to the pool. -->
     <method name="AddDataDevs">
       <!-- List of devices to add. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if devices were added, otherwise false.
         ao: Object paths of the newly added devices, may be empty.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using Clevis. -->
     <method name="BindClevis">
       <!-- Clevis pin. -->
-      <arg name="pin" type="s" direction="in" />
+      <arg name="pin" type="s" direction="in"/>
       <!-- Pin-specific Clevis configuration information. -->
-      <arg name="json" type="s" direction="in" />
+      <arg name="json" type="s" direction="in"/>
       <!--
          Optional token slot index to bind the pool at. If no token slot
 	 specified, use the first available empty slot.
       -->
-      <arg name="token_slot" type="(bu)" direction="in" />
+      <arg name="token_slot" type="(bu)" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Bind an already encrypted pool using a key in the kernel keyring. -->
     <method name="BindKeyring">
       <!-- Description of the key in the kernel keyring. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!--
          Optional token slot index to bind the pool at. If no token slot
 	 specified, use the first available empty slot.
       -->
-      <arg name="token_slot" type="(bu)" direction="in" />
+      <arg name="token_slot" type="(bu)" direction="in"/>
       <!-- True if any new bindings were added, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Create filesystems for the pool. -->
     <method name="CreateFilesystems">
@@ -1923,26 +1924,26 @@
            bs: Optional size specification
            bs: Optional size limit specification
       -->
-      <arg name="specs" type="a(s(bs)(bs))" direction="in" />
+      <arg name="specs" type="a(s(bs)(bs))" direction="in"/>
       <!--
         b: True if any filesystem was added, otherwise false.
         os: Object paths of newly added filesystems.
       -->
-      <arg name="results" type="(ba(os))" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(ba(os))" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Destroy the specified filesystems. -->
     <method name="DestroyFilesystems">
       <!-- List of filesystem object paths to destroy. -->
-      <arg name="filesystems" type="ao" direction="in" />
+      <arg name="filesystems" type="ao" direction="in"/>
       <!--
         b: True if any filesystems were destroyed, otherwise false.
         as: UUIDs of destroyed filesystems.
       -->
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Get filesystem metadata. -->
     <method name="FilesystemMetadata">
@@ -1952,36 +1953,36 @@
          b: True if the filesystem name is specified, otherwise false.
          s: Filesystem name.
       -->
-      <arg name="fs_name" type="(bs)" direction="in" />
+      <arg name="fs_name" type="(bs)" direction="in"/>
       <!--
          True if the metadata that would be written if it were written now,
          false if the metadata that is currently on disk.
       -->
-      <arg name="current" type="b" direction="in" />
+      <arg name="current" type="b" direction="in"/>
       <!-- Filesystem metadata. -->
-      <arg name="results" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Extend the available size of a pool. -->
     <method name="GrowPhysicalDevice">
       <!-- UUID of data device belonging to pool to extend. -->
-      <arg name="dev" type="s" direction="in" />
-      <arg name="results" type="(bas)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="dev" type="s" direction="in"/>
+      <arg name="results" type="(bas)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Initialize a cache. -->
     <method name="InitCache">
       <!-- List of devices to initialize the cache with. -->
-      <arg name="devices" type="as" direction="in" />
+      <arg name="devices" type="as" direction="in"/>
       <!--
         b: True if the cache was initialized, otherwise false.
         ao: Object paths of devices in the cache.
       -->
-      <arg name="results" type="(bao)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="(bao)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Get pool metadata. -->
     <method name="Metadata">
@@ -1989,11 +1990,11 @@
          True if the metadata that would be written if it were written now,
          false if the metadata that is currently on disk.
       -->
-      <arg name="current" type="b" direction="in" />
+      <arg name="current" type="b" direction="in"/>
       <!-- Pool metadata. -->
-      <arg name="results" type="s" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="s" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Regenerate Clevis bindings for devices in the pool using the existing
@@ -2004,15 +2005,15 @@
          Optional token slot index to rebind the pool at. If no token slot
 	 specified, use the first slot bound with Clevis.
       -->
-      <arg name="token_slot" type="(bu)" direction="in" />
+      <arg name="token_slot" type="(bu)" direction="in"/>
       <!--
         True if all bindings were successfully regenerated. Because of the
         nature of Clevis rebinding generation, this method will always return
         true on success.
       -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!--
       Replace the existing key description with the specified one for devices
@@ -2020,42 +2021,42 @@
     -->
     <method name="RebindKeyring">
       <!-- Key description. -->
-      <arg name="key_desc" type="s" direction="in" />
+      <arg name="key_desc" type="s" direction="in"/>
       <!--
          Optional token slot index to rebind the pool at. If no token slot
 	 specified, use the first slot bound with this method.
       -->
-      <arg name="token_slot" type="(bu)" direction="in" />
+      <arg name="token_slot" type="(bu)" direction="in"/>
       <!-- True if the specified key description is different. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Set the pool name. -->
     <method name="SetName">
       <!-- Name. -->
-      <arg name="name" type="s" direction="in" />
+      <arg name="name" type="s" direction="in"/>
       <!--
         b: True if the name was changed, otherwise false.
         s: UUID of the pool or a default UUID if no change was made.
       -->
-      <arg name="result" type="(bs)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bs)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Make a snapshot of a Stratis filesystem. -->
     <method name="SnapshotFilesystem">
       <!-- Object path of the origin filesystem. -->
-      <arg name="origin" type="o" direction="in" />
+      <arg name="origin" type="o" direction="in"/>
       <!-- Name of the snapshot to be created. -->
-      <arg name="snapshot_name" type="s" direction="in" />
+      <arg name="snapshot_name" type="s" direction="in"/>
       <!--
         b: True if a new filesystem was created, otherwise false.
         o: Object path of the snapshot.
       -->
-      <arg name="result" type="(bo)" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="result" type="(bo)" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Remove Clevis encryption from the devices in the pool. -->
     <method name="UnbindClevis">
@@ -2064,11 +2065,11 @@
          If no token slot specified, remove the binding from the first slot
          bound with this method.
       -->
-      <arg name="token_slot" type="(bu)" direction="in" />
+      <arg name="token_slot" type="(bu)" direction="in"/>
       <!-- True if some Clevis bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Unbind a keyring passphrase from the devices in the pool. -->
     <method name="UnbindKeyring">
@@ -2077,20 +2078,20 @@
          If no token slot specified, remove the binding from the first slot
          bound with this method.
       -->
-      <arg name="token_slot" type="(bu)" direction="in" />
+      <arg name="token_slot" type="(bu)" direction="in"/>
       <!-- True if some bindings were removed, otherwise false. -->
-      <arg name="results" type="b" direction="out" />
-      <arg name="return_code" type="q" direction="out" />
-      <arg name="return_string" type="s" direction="out" />
+      <arg name="results" type="b" direction="out"/>
+      <arg name="return_code" type="q" direction="out"/>
+      <arg name="return_string" type="s" direction="out"/>
     </method>
     <!-- Total space allocated from the pool. -->
-    <property name="AllocatedSize" type="s" access="read" />
+    <property name="AllocatedSize" type="s" access="read"/>
     <!--
       Indicates the current capabilities of the pool. Generally the pool has
       full capability, but under certain circumstances stratisd may restrict
       the actions that the pool can perform.
     -->
-    <property name="AvailableActions" type="s" access="read" />
+    <property name="AvailableActions" type="s" access="read"/>
     <!--
       For V1 pools, Clevis configuration information representing the
       Clevis encryption situation for all devices in the pool.
@@ -2110,18 +2111,18 @@
           s: Clevis pin.
 	  s: Pin-specific Clevis configuration information.
     -->
-    <property name="ClevisInfos" type="v" access="read" />
+    <property name="ClevisInfos" type="v" access="read"/>
     <!-- True if the pool is encrypted, otherwise false. -->
     <property name="Encrypted" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!--
       The maximum number of filesystems that the pool supports. May be
       increased, but not decreased.
     -->
-    <property name="FsLimit" type="t" access="readwrite" />
+    <property name="FsLimit" type="t" access="readwrite"/>
     <!-- True if the pool has a cache, otherwise false. -->
-    <property name="HasCache" type="b" access="read" />
+    <property name="HasCache" type="b" access="read"/>
     <!--
       For V1 pools, key description information representing the
       key description situation for all devices in the pool.
@@ -2138,42 +2139,42 @@
         u: Token slot.
 	s: Associated key description.
     -->
-    <property name="KeyDescriptions" type="v" access="read" />
+    <property name="KeyDescriptions" type="v" access="read"/>
     <!-- Pool metadata version. -->
     <property name="MetadataVersion" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
     <!-- Name of the pool. -->
-    <property name="Name" type="s" access="read" />
+    <property name="Name" type="s" access="read"/>
     <!--
       If true, then all the space on the pool's devices has been allocated
       to some part of its storage stack. No further allocation, as would be
       necessary to do if increasing the number of filesystems that the pool
       supports, is possible.
     -->
-    <property name="NoAllocSpace" type="b" access="read" />
+    <property name="NoAllocSpace" type="b" access="read"/>
     <!--
       True if the pool allows overprovisioning, otherwise false. Setting this
       property to false will fail if the sum of the logical sizes of the
       filesystems that the pool contains is more than the physical space
       available for them.
     -->
-    <property name="Overprovisioning" type="b" access="readwrite" />
+    <property name="Overprovisioning" type="b" access="readwrite"/>
     <!--
       Total size of the pool. The sum of the sizes of all the block
       devices in the pool's data tier.
     -->
-    <property name="TotalPhysicalSize" type="s" access="read" />
+    <property name="TotalPhysicalSize" type="s" access="read"/>
     <!--
       Total space used in the pool. This includes space allocated by Stratis
       for pool management and consequently unavailable for any other purpose,
       as well as all space required by data written to every Stratis
       filesystem on the pool.
     -->
-    <property name="TotalPhysicalUsed" type="(bs)" access="read" />
+    <property name="TotalPhysicalUsed" type="(bs)" access="read"/>
     <!-- Stratis UUID of the pool. -->
     <property name="Uuid" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
   </interface>
 </node>

From f854021b143dd6f3bd751a1f71ffd7d5e07cb62f Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Fri, 8 May 2026 14:49:30 -0400
Subject: [PATCH 3/4] github actions: Verify well-formatted introspection data

Signed-off-by: mulhern <amulhern@redhat.com>
---
 .github/workflows/main.yml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5d1af7a..ea48243 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,19 +26,7 @@ jobs:
       - name: Run test
         run: make -f Makefile check
 
-  ci-checks:
-    runs-on: ubuntu-latest
-    container: fedora:43  # CURRENT DEVELOPMENT ENVIRONMENT
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-      - name: Install dependencies
-        run: dnf install -y make yamllint
-      - name: Run test
-        run: make -f Makefile yamllint
-
-  spelling-checks:
+  spelling-and-formatting-checks:
     runs-on: ubuntu-latest
     container: fedora:43  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
@@ -47,6 +35,9 @@ jobs:
           dnf install -y
           clang
           make
+          xmllint
+          which
+          yamllint
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
@@ -57,5 +48,9 @@ jobs:
       - uses: baptiste0928/cargo-install@v3
         with:
           crate: typos-cli
-      - name: Run test
+      - name: Run spell check
         run: make -f Makefile check-typos
+      - name: Run format check
+        run: make -f Makefile fmt
+      - name: Run lint check
+        run: make -f Makefile yamllint

From 2045cf8165c02fa46cc4f51fc1c5e4ea66059696 Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Mon, 11 May 2026 23:10:32 -0400
Subject: [PATCH 4/4] Add r8 properties FreeTokenSlots and VolumeKeyLoaded

Signed-off-by: mulhern <amulhern@redhat.com>
---
 docs/dbus/pool.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/dbus/pool.xml b/docs/dbus/pool.xml
index 2fff4c7..9cb2557 100644
--- a/docs/dbus/pool.xml
+++ b/docs/dbus/pool.xml
@@ -2116,6 +2116,8 @@
     <property name="Encrypted" type="b" access="read">
       <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
+    <!-- TODO -->
+    <property name="FreeTokenSlots" type="(by)" access="read"/>
     <!--
       The maximum number of filesystems that the pool supports. May be
       increased, but not decreased.
@@ -2176,5 +2178,9 @@
     <property name="Uuid" type="s" access="read">
       <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
     </property>
+    <!-- TODO -->
+    <property name="VolumeKeyLoaded" type="v" access="read">
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+    </property>
   </interface>
 </node>