diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index f9ea2be0..15d9c658 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -27,8 +27,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="at_aconet_productionAggregate" parent="DOMResourceSourceStage"
-        p:id="at_aconet_productionAggregate">
+    <bean id="at_aconet_productionAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -40,8 +39,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="at_aconet_edugainAggregate" parent="DOMResourceSourceStage"
-        p:id="at_aconet_edugainAggregate">
+    <bean id="at_aconet_edugainAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -59,12 +57,10 @@
     <!--
         Check signing signature.
     -->
-    <bean id="at_aconet_checkProductionSignature" parent="XMLSignatureValidationStage"
-        p:id="at_aconet_checkProductionSignature">
+    <bean id="at_aconet_checkProductionSignature" parent="XMLSignatureValidationStage">
         <property name="verificationCertificate" ref="at_aconet_signingCertificate"/>
     </bean>
-    <bean id="at_aconet_checkEdugainSignature" parent="XMLSignatureValidationStageSHA256"
-        p:id="at_aconet_checkEdugainSignature">
+    <bean id="at_aconet_checkEdugainSignature" parent="XMLSignatureValidationStageSHA256">
         <property name="verificationCertificate" ref="at_aconet_signingCertificate"/>
     </bean>
     
@@ -74,8 +70,7 @@
         Any registrationAuthority already present on an entity in this
         channel must match the known registration authority value.
     -->
-    <bean id="at_aconet_check_regauth" parent="check_regauth_parent"
-        p:id="at_aconet_check_regauth">
+    <bean id="at_aconet_check_regauth" parent="check_regauth_parent">
         <property name="transformParameters">
             <map>
                 <entry key="expectedAuthority" value-ref="at_aconet_registrar"/>
@@ -89,8 +84,7 @@
         Provide a default registrationAuthority appropriate to
         this channel.
     -->
-    <bean id="at_aconet_default_regauth" parent="default_regauth_parent"
-        p:id="at_aconet_default_regauth">
+    <bean id="at_aconet_default_regauth" parent="default_regauth_parent">
         <property name="transformParameters">
             <map>
                 <entry key="defaultAuthority" value-ref="at_aconet_registrar"/>
@@ -101,8 +95,7 @@
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="at_aconet_productionEntities" parent="CompositeStage"
-        p:id="at_aconet_productionEntities">
+    <bean id="at_aconet_productionEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="at_aconet_productionAggregate"/>
@@ -124,8 +117,7 @@
     <!--
         Fetch the eduGAIN export entities as a collection.
     -->
-    <bean id="at_aconet_edugainEntities" parent="CompositeStage"
-        p:id="at_aconet_edugainEntities">
+    <bean id="at_aconet_edugainEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="at_aconet_edugainAggregate"/>
diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
index 0a7547ff..cc7897d1 100644
--- a/mdx/at_aconet/verbs.xml
+++ b/mdx/at_aconet/verbs.xml
@@ -22,8 +22,7 @@
     -->
     <import resource="classpath:at_aconet/beans.xml"/>
     
-    <bean id="serializeImported" parent="SerializationStage"
-        p:id="serializeImported">
+    <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/mdx/at_aconet/imported.xml"/>
@@ -31,8 +30,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="SimplePipeline"
-        p:id="importProduction">
+    <bean id="importProduction" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionEntities"/>
@@ -43,8 +41,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="SimplePipeline"
-        p:id="importProductionRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionAggregate"/>
@@ -53,8 +50,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="SimplePipeline"
-        p:id="importEdugain">
+    <bean id="importEdugain" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
@@ -65,8 +61,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="SimplePipeline"
-        p:id="importEdugainRaw">
+    <bean id="importEdugainRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainAggregate"/>
@@ -75,15 +70,13 @@
         </property>
     </bean>
     
-    <bean id="verifyEdugain" parent="SimplePipeline"
-        p:id="verifyEdugain">
+    <bean id="verifyEdugain" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
                 <ref bean="standardImportActions"/>
 
-                <bean parent="X509ValidationStage"
-                    p:id="checkCertificates">
+                <bean id="checkCertificates" parent="X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
@@ -97,9 +90,8 @@
                     Remove a specific entity we know has a problem that it will take
                     a while to resolve.
                 -->
-                <bean parent="stage_parent"
+                <bean id="filterEntities" parent="stage_parent"
                     class="net.shibboleth.metadata.dom.saml.EntityFilterStage"
-                    p:id="filterEntities"
                     p:whitelistingEntities="false">
                     <property name="designatedEntities">
                         <set>
diff --git a/mdx/int_cobweb/beans.xml b/mdx/int_cobweb/beans.xml
index 5569adf4..67b9d2ea 100644
--- a/mdx/int_cobweb/beans.xml
+++ b/mdx/int_cobweb/beans.xml
@@ -22,8 +22,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="int_cobweb_productionAggregate" parent="DOMResourceSourceStage"
-        p:id="int_cobweb_productionAggregate">
+    <bean id="int_cobweb_productionAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -46,16 +45,14 @@
     <!--
         Check signing signature.
     -->
-    <bean id="int_cobweb_checkSignature" parent="XMLSignatureValidationStage"
-        p:id="int_cobweb_checkSignature">
+    <bean id="int_cobweb_checkSignature" parent="XMLSignatureValidationStage">
         <property name="verificationCertificate" ref="int_cobweb_signingCertificate"/>
     </bean>
 
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="int_cobweb_productionEntities" parent="CompositeStage"
-        p:id="int_cobweb_productionEntities">
+    <bean id="int_cobweb_productionEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="int_cobweb_productionAggregate"/>
diff --git a/mdx/int_cobweb/verbs.xml b/mdx/int_cobweb/verbs.xml
index 7f955df6..063cb743 100644
--- a/mdx/int_cobweb/verbs.xml
+++ b/mdx/int_cobweb/verbs.xml
@@ -22,8 +22,7 @@
     -->
     <import resource="classpath:int_cobweb/beans.xml"/>
     
-    <bean id="serializeImported" parent="SerializationStage"
-        p:id="serializeImported">
+    <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/mdx/int_cobweb/imported.xml"/>
@@ -31,8 +30,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="SimplePipeline"
-        p:id="importProduction">
+    <bean id="importProduction" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_cobweb_productionEntities"/>
@@ -43,8 +41,7 @@
         </property>
     </bean>
     
-    <bean id="verifyProduction" parent="SimplePipeline"
-        p:id="verifyProduction">
+    <bean id="verifyProduction" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_cobweb_productionEntities"/>
@@ -54,8 +51,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="SimplePipeline"
-        p:id="importProductionRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_cobweb_productionAggregate"/>
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 24084fc8..7bf73818 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -32,8 +32,7 @@
     <!--
         Fetches the eduGAIN production aggregate.
     -->
-    <bean id="int_edugain_productionAggregate" parent="DOMResourceSourceStage"
-        p:id="int_edugain_productionAggregate">
+    <bean id="int_edugain_productionAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -45,8 +44,7 @@
     <!--
         Fetch the eduGAIN test aggregate.
     -->
-    <bean id="int_edugain_testAggregate" parent="DOMResourceSourceStage"
-        p:id="int_edugain_testAggregate">
+    <bean id="int_edugain_testAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -64,8 +62,7 @@
     <!--
         Check a signature against the eduGAIN signing certificate.
     -->
-    <bean id="int_edugain_checkSignature" parent="XMLSignatureValidationStageSHA256"
-        p:id="int_edugain_checkSignature">
+    <bean id="int_edugain_checkSignature" parent="XMLSignatureValidationStageSHA256">
         <property name="verificationCertificate" ref="int_edugain_signingCertificate"/>
     </bean>
 
@@ -73,15 +70,13 @@
         Remove blacklisted entities.
     -->
     <bean id="int_edugain_removeBlacklistedEntities" parent="EntityFilterStage"
-        p:id="int_edugain_removeBlacklistedEntities"
         p:whitelistingEntities="false"
         p:designatedEntities-ref="int_edugain_entity_blacklist"/>
 
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="int_edugain_productionEntities" parent="CompositeStage"
-        p:id="int_edugain_productionEntities">
+    <bean id="int_edugain_productionEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="int_edugain_productionAggregate"/>
@@ -111,8 +106,7 @@
     <!--
         Fetch the test entities as a collection.
     -->
-    <bean id="int_edugain_testEntities" parent="CompositeStage"
-        p:id="int_edugain_testEntities">
+    <bean id="int_edugain_testEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="int_edugain_testAggregate"/>
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index ae4800f9..ed89148c 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -23,8 +23,7 @@
     <import resource="classpath:int_edugain/beans.xml"/>
     <import resource="classpath:int_edugain/verify-blacklist.xml"/>
     
-    <bean id="serializeImported" parent="SerializationStage"
-        p:id="serializeImported">
+    <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/mdx/int_edugain/imported.xml"/>
@@ -32,8 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="SimplePipeline"
-        p:id="importProduction">
+    <bean id="importProduction" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
@@ -44,8 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="SimplePipeline"
-        p:id="importProductionRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionAggregate"/>
@@ -54,8 +51,7 @@
         </property>
     </bean>
     
-    <bean id="importTest" parent="SimplePipeline"
-        p:id="importTest">
+    <bean id="importTest" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_testEntities"/>
@@ -74,13 +70,11 @@
         blacklist are ignored, so that we only need to deal with each entity
         entering an error state once.
     -->
-    <bean id="verify" parent="SimplePipeline"
-        p:id="verify">
+    <bean id="verify" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
                 <bean id="removeBlacklistedEntities" parent="EntityFilterStage"
-                    p:id="removeBlacklistedEntities"
                     p:whitelistingEntities="false"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
 
@@ -96,8 +90,7 @@
         Looks for eduGAIN entities which *were* in an error state, as shown by
         their inclusion in our verification blacklist, but have now recovered.
     -->
-    <bean id="verify.recovered" parent="SimplePipeline"
-        p:id="verify.recovered">
+    <bean id="verify.recovered" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
@@ -108,13 +101,11 @@
                 
                 <!-- remove all entities *other* than the ones in the blacklist -->
                 <bean id="removeAllButBlacklistedEntities" parent="EntityFilterStage"
-                    p:id="removeAllButBlacklistedEntities"
                     p:whitelistingEntities="true"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
                 
                 <!-- flag up any remaining entities -->
-                <bean id="check_recovered" parent="XSLValidationStage"
-                    p:id="check_recovered">
+                <bean id="check_recovered" parent="XSLValidationStage">
                     <property name="XSLResource">
                         <bean parent="FileSystemResource">
                             <constructor-arg value="${basedir}/mdx/int_edugain/check_recovered.xsl"/>
@@ -132,8 +123,7 @@
         Same as verify, but not making use of the validation
         blacklist. Can be used to check up on blacklisted entities.
     -->
-    <bean id="verify.all" parent="SimplePipeline"
-        p:id="verify.all">
+    <bean id="verify.all" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml
index df4b72ce..be4fce06 100644
--- a/mdx/test/beans.xml
+++ b/mdx/test/beans.xml
@@ -16,8 +16,7 @@
         Fetch the aggregate aggregate.
     -->
     <bean id="test_aggregate" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DomFilesystemSourceStage"
-        p:id="test_aggregate">
+        class="net.shibboleth.metadata.dom.DomFilesystemSourceStage">
         <property name="parserPool" ref="parserPool"/>
         <property name="source">
             <bean class="java.io.File">
@@ -29,8 +28,7 @@
     <!--
         Fetch and process the entities as a collection.
     -->
-    <bean id="test_entities" parent="CompositeStage"
-        p:id="test_entities">
+    <bean id="test_entities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="test_aggregate"/>
diff --git a/mdx/test/verbs.xml b/mdx/test/verbs.xml
index 3ec747b3..a3bfd4fb 100644
--- a/mdx/test/verbs.xml
+++ b/mdx/test/verbs.xml
@@ -22,8 +22,7 @@
     -->
     <import resource="classpath:test/beans.xml"/>
     
-    <bean id="serializeImported" parent="SerializationStage"
-        p:id="serializeImported">
+    <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/mdx/test/imported.xml"/>
@@ -31,8 +30,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="SimplePipeline"
-        p:id="import">
+    <bean id="import" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="test_entities"/>
@@ -43,8 +41,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="SimplePipeline"
-        p:id="importRaw">
+    <bean id="importRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="test_aggregate"/>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 0bd5e268..b3ddbdc8 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -42,8 +42,7 @@
     <!--
         Fetch the export aggregate.
     -->
-    <bean id="uk_exportAggregate" parent="DOMResourceSourceStage"
-        p:id="uk_exportAggregate">
+    <bean id="uk_exportAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -56,8 +55,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="uk_productionAggregate" parent="DOMResourceSourceStage"
-        p:id="uk_productionAggregate">
+    <bean id="uk_productionAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -82,8 +80,7 @@
     <!--
         Check the signature on a document.
     -->
-    <bean id="uk_checkSignature" parent="XMLSignatureValidationStage"
-        p:id="uk_checkSignature">
+    <bean id="uk_checkSignature" parent="XMLSignatureValidationStage">
         <property name="verificationCertificate" ref="uk_signingCertificate"/>
     </bean>
     
@@ -96,8 +93,7 @@
         expected value.
     -->
     <bean id="uk_check_validUntil" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.ValidateValidUntilStage"
-        p:id="uk_check_validUntil">
+        class="net.shibboleth.metadata.dom.saml.ValidateValidUntilStage">
         <!--
             The validUntil attribute must be present.
         -->
@@ -118,8 +114,7 @@
         eligible file matches a particular regular expression.
     -->
     <bean id="uk_fetchFragmentFiles" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DOMFilesystemSourceStage"
-        p:id="uk_fetchFragmentFiles">
+        class="net.shibboleth.metadata.dom.DOMFilesystemSourceStage">
         <property name="parserPool" ref="parserPool"/>
         <property name="source">
             <bean class="java.io.File">
@@ -148,8 +143,7 @@
         This transform can be run on individual EntityDescriptors or on an
         aggregate EntitiesDescriptor.
     -->
-    <bean id="uk_processScopes" parent="XSLTransformationStage"
-        p:id="uk_processScopes">
+    <bean id="uk_processScopes" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="ClassPathResource">
                 <constructor-arg value="uk/scopes.xsl"/>
@@ -203,8 +197,7 @@
         
         Adds "mailto:" to md:EmailAddress elements which don't already have it.
     -->
-    <bean id="uk_fix_mailto" parent="XSLTransformationStage"
-        p:id="uk_fix_mailto">
+    <bean id="uk_fix_mailto" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="ClassPathResource">
                 <constructor-arg value="uk/fix_mailto.xsl"/>
@@ -218,8 +211,7 @@
         
         Checks specific to the UK registrar function.
     -->
-    <bean id="check_ukreg" parent="XSLValidationStage"
-        p:id="check_ukreg">
+    <bean id="check_ukreg" parent="XSLValidationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/check_ukreg.xsl"/>
@@ -236,8 +228,7 @@
     <!--
         check_uk_keydesc_key
     -->
-    <bean id="check_uk_keydesc_key" parent="XSLValidationStage"
-        p:id="check_uk_keydesc_key">
+    <bean id="check_uk_keydesc_key" parent="XSLValidationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/check_uk_keydesc_key.xsl"/>
@@ -249,8 +240,7 @@
     <!--
         check_uk_mdattr
     -->
-    <bean id="check_uk_mdattr" parent="XSLValidationStage"
-        p:id="check_uk_mdattr">
+    <bean id="check_uk_mdattr" parent="XSLValidationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/check_uk_mdattr.xsl"/>
@@ -262,8 +252,7 @@
     <!--
         check_uk_mdrps
     -->
-    <bean id="check_uk_mdrps" parent="XSLValidationStage"
-        p:id="check_uk_mdrps">
+    <bean id="check_uk_mdrps" parent="XSLValidationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/check_uk_mdrps.xsl"/>
@@ -275,8 +264,7 @@
     <!--
         check_uk_urlenc
     -->
-    <bean id="check_uk_urlenc" parent="XSLValidationStage"
-        p:id="check_uk_urlenc">
+    <bean id="check_uk_urlenc" parent="XSLValidationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/check_uk_urlenc.xsl"/>
@@ -290,8 +278,7 @@
         
         This stage performs any standard cleanup required for UK federation fragment files.
     -->
-    <bean id="uk_processFragment" parent="XSLTransformationStage"
-        p:id="uk_processFragment">
+    <bean id="uk_processFragment" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="ClassPathResource">
                 <constructor-arg value="uk/fragment.xsl"/>
@@ -306,8 +293,7 @@
         Remove any md:ContactPerson elements with contactType of "administrative".
     -->
     <bean id="uk_stripAdminContacts" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.ContactPersonFilterStage"
-        p:id="uk_stripAdminContacts">
+        class="net.shibboleth.metadata.dom.saml.ContactPersonFilterStage">
         <property name="designatedTypes">
             <list>
                 <value>administrative</value>
@@ -321,8 +307,7 @@
         Populate UKId values from entities.
     -->
     <bean id="uk_populateIds" parent="stage_parent"
-        class="uk.org.ukfederation.mda.EntityDescriptorUKIdPopulationStage"
-        p:id="uk_populateIds"/>
+        class="uk.org.ukfederation.mda.EntityDescriptorUKIdPopulationStage"/>
     
 
     <!--
@@ -331,8 +316,7 @@
         Name attribute is set to the federation URI.  UK ordering is applied.
     -->
     <bean id="uk_assemble" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage"
-        p:id="uk_assemble">
+        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage">
         <property name="descriptorName" ref="uk_federation_uri"/>
         <property name="itemOrderingStrategy">
             <bean class="uk.org.ukfederation.mda.UKEntityOrderingStrategy"/>
@@ -346,8 +330,7 @@
         Name attribute is not set.  UK ordering is applied.
     -->
     <bean id="uk_assembleUnnamed" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage"
-        p:id="uk_assembleUnnamed">
+        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage">
         <property name="itemOrderingStrategy">
             <bean class="uk.org.ukfederation.mda.UKEntityOrderingStrategy"/>
         </property>
@@ -357,8 +340,7 @@
     <!--
         Fetch and process the registered entities as a collection.
     -->
-    <bean id="uk_registeredEntities" parent="CompositeStage"
-        p:id="uk_registeredEntities">
+    <bean id="uk_registeredEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="uk_fetchFragmentFiles"/>
@@ -373,7 +355,7 @@
                     Add REFEDS Hide from Discovery category as a standardised
                     equivalent to our HideFromWAYF element.
                 -->
-                <bean p:id="uk_addHideFromDiscovery" parent="SplitMergeStage">
+                <bean id="uk_addHideFromDiscovery" parent="SplitMergeStage">
                     <!-- select entities with HideFromWayf label -->
                     <property name="selectionStrategy">
                         <bean parent="XPathItemSelectionStrategy">
@@ -386,9 +368,9 @@
                         Pipeline for selected items.
                     -->
                     <property name="selectedItemPipeline">
-                        <bean p:id="selectedItemPipeline" parent="SimplePipeline">
+                        <bean id="selectedItemPipeline" parent="SimplePipeline">
                             <property name="stages">
-                                <bean p:id="addHideFromDiscovery" parent="EntityAttributeAddingStage"
+                                <bean id="addHideFromDiscovery" parent="EntityAttributeAddingStage"
                                     p:attributeValue="http://refeds.org/category/hide-from-discovery"
                                     p:addingFirstChild="true"/>
                             </property>
@@ -402,7 +384,7 @@
                         we move to MDA 0.9.0.
                     -->
                     <property name="nonselectedItemPipeline">
-                        <bean p:id="nonselectedItemPipeline" parent="SimplePipeline">
+                        <bean id="nonselectedItemPipeline" parent="SimplePipeline">
                             <property name="stages">
                                 <list>
                                     <!-- nothing required -->
@@ -424,8 +406,7 @@
                 <ref bean="mdui_dn_en_match"/>
                 <ref bean="check_dup_display"/>
                 
-                <bean parent="X509ValidationStage"
-                    p:id="checkCertificates">
+                <bean id="checkCertificates" parent="X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
@@ -466,8 +447,7 @@
         
         Strip those UK federation extensions which we never publish.
     -->
-    <bean id="uk_stripExtensions" parent="XSLTransformationStage"
-        p:id="uk_stripExtensions">
+    <bean id="uk_stripExtensions" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="ClassPathResource">
                 <constructor-arg value="uk/strip_extensions.xsl"/>
@@ -491,8 +471,7 @@
         used in an XML document.  This one is UK-specific, as it makes specific choices
         in order to limit the number of prefixes used.
     -->
-    <bean id="uk_normaliseNamespaces" parent="XSLTransformationStage"
-        p:id="uk_normaliseNamespaces">
+    <bean id="uk_normaliseNamespaces" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/ns_norm_uk.xsl"/>
@@ -514,8 +493,7 @@
         Any registrationAuthority already present on an entity in this
         channel must match the known registration authority value.
     -->
-    <bean id="uk_check_regauth"  parent="check_regauth_parent"
-        p:id="uk_check_regauth">
+    <bean id="uk_check_regauth"  parent="check_regauth_parent">
         <property name="transformParameters">
             <map>
                 <entry key="expectedAuthority" value-ref="uk_ukf_registrar"/>
@@ -529,8 +507,7 @@
         Provide a default registrationAuthority appropriate to
         this channel.
     -->
-    <bean id="uk_default_regauth" parent="default_regauth_parent"
-        p:id="uk_default_regauth">
+    <bean id="uk_default_regauth" parent="default_regauth_parent">
         <property name="transformParameters">
             <map>
                 <entry key="defaultAuthority" value-ref="uk_ukf_registrar"/>
@@ -552,8 +529,7 @@
         Serialise the (assumed HTML) DomDocumentItem into the UK federation statistics
         output file in the production XML directory.
     -->
-    <bean id="uk_serializeStatistics" parent="SerializationStage"
-        p:id="uk_serializeStatistics">
+    <bean id="uk_serializeStatistics" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/xml/ukfederation-stats.html"/>
@@ -566,8 +542,7 @@
         
         Input is an aggregate of all registered entities, output is the HTML statistics.
     -->
-    <bean id="uk_generateStatistics" parent="XSLTransformationStage"
-        p:id="uk_generateStatistics">
+    <bean id="uk_generateStatistics" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="ClassPathResource">
                 <constructor-arg value="uk/statistics.xsl"/>
@@ -588,8 +563,7 @@
         resulting HTML output is written into the appropriate file in the production
         XML directory.
     -->
-    <bean id="uk_statisticsPipeline" parent="SimplePipeline"
-        p:id="uk_statisticsPipeline">
+    <bean id="uk_statisticsPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="assemble"/>
@@ -610,8 +584,7 @@
     <!--
         Fetch the export entities as a collection.
     -->
-    <bean id="uk_exportedEntities" parent="CompositeStage"
-        p:id="uk_exportedEntities">
+    <bean id="uk_exportedEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="uk_exportAggregate"/>
diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml
index 0ea376b7..b6f56398 100644
--- a/mdx/uk/collect.xml
+++ b/mdx/uk/collect.xml
@@ -22,8 +22,7 @@
     -->
     <import resource="classpath:uk/beans.xml"/>
 
-    <bean id="serializeCollected" parent="SerializationStage"
-        p:id="serializeCollected">
+    <bean id="serializeCollected" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/mdx/uk/collected.xml"/>
@@ -31,8 +30,7 @@
         </property>
     </bean>
 
-    <bean id="collect" parent="SimplePipeline"
-        p:id="collect">
+    <bean id="collect" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 37a64800..763a889c 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -43,8 +43,7 @@
         Remove entity-level Scope elements, leaving only the ones associated
         with role descriptors.    
     -->
-    <bean id="stripEntityScopes" parent="XSLTransformationStage"
-        p:id="stripEntityScopes">
+    <bean id="stripEntityScopes" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="ClassPathResource">
                 <constructor-arg value="uk/entity_scopes.xsl"/>
@@ -102,8 +101,7 @@
         Patch any @use-less KeyName descriptors in IdP roles
         for the benefit of Shib SPs pre-1.3.1.
     -->
-    <bean id="fixup_keyuse" parent="XSLTransformationStage"
-        p:id="fixup_keyuse">
+    <bean id="fixup_keyuse" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="ClassPathResource">
                 <constructor-arg value="uk/fixup_keyuse.xsl"/>
@@ -114,8 +112,7 @@
     <!--
         check_fixup_keyuse
     -->
-    <bean id="check_fixup_keyuse" parent="XSLValidationStage"
-        p:id="check_fixup_keyuse">
+    <bean id="check_fixup_keyuse" parent="XSLValidationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/check_fixup_keyuse.xsl"/>
@@ -131,8 +128,7 @@
         export flows, for which we desire the closest possible correspondence to
         the registered metadata.
     -->
-    <bean id="checkPublishable" parent="CompositeStage"
-        p:id="checkPublishable">
+    <bean id="checkPublishable" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="checkSchemas"/>
@@ -159,8 +155,7 @@
         from another registrar or metadata exchange as they may be
         old versions of entities we have deregistered, or spoofed.
     -->
-    <bean id="removeUKEntities" parent="EntityRegistrationAuthorityFilterStage"
-        p:id="removeUKEntities">
+    <bean id="removeUKEntities" parent="EntityRegistrationAuthorityFilterStage">
         <property name="designatedRegistrationAuthorities">
             <list>
                 <ref bean="uk_ukf_registrar"/>
@@ -177,7 +172,6 @@
     -->
     <bean id="removeBlacklistedEntities" parent="stage_parent"
         class="net.shibboleth.metadata.dom.saml.EntityFilterStage"
-        p:id="removeBlacklistedEntities"
         p:whitelistingEntities="false"
         p:designatedEntities-ref="importEntityBlacklist"/>
 
@@ -186,8 +180,7 @@
         
         Common actions to be performed on each import pipeline.
     -->
-    <bean id="importCommonTail" parent="CompositeStage"
-        p:id="importCommonTail">
+    <bean id="importCommonTail" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="removeUKEntities"/>
@@ -205,8 +198,7 @@
         </property>
     </bean>
 
-    <bean id="uk_int_edugain_importPipeline" parent="SimplePipeline"
-        p:id="uk_int_edugain_importPipeline">
+    <bean id="uk_int_edugain_importPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
@@ -214,7 +206,7 @@
                 <!--
                     Entity Attribute policy for entities from eduGAIN participants.
                 -->
-                <bean parent="EntityAttributeFilteringStage" p:id="entityAttributes">
+                <bean id="entityAttributes" parent="EntityAttributeFilteringStage">
                     <property name="rules">
                         <list>
                             <!-- Permit GÉANT CoC category from any eduGAIN participant. -->
@@ -250,8 +242,7 @@
         ***************************************************
     -->
     
-    <bean id="uk_finaliseProduction" parent="finalise_parent"
-        p:id="uk_finaliseProduction">
+    <bean id="uk_finaliseProduction" parent="finalise_parent">
         <property name="transformParameters">
             <map>
                 <entry key="publisher" value-ref="uk_federation_uri"/>
@@ -259,8 +250,7 @@
         </property>
     </bean>
 
-    <bean id="serializeUnsignedProductionAggregate" parent="SerializationStage"
-        p:id="serializeUnsignedProductionAggregate">
+    <bean id="serializeUnsignedProductionAggregate" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/xml/ukfederation-metadata-unsigned.xml"/>
@@ -268,8 +258,7 @@
         </property>
     </bean>
 
-    <bean id="uk_productionPipeline" parent="SimplePipeline"
-        p:id="uk_productionPipeline">
+    <bean id="uk_productionPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -318,8 +307,7 @@
         <constructor-arg ref="commonNamespaces"/>
     </bean>
     
-    <bean id="serializeUnsignedWayfAggregate" parent="SerializationStage"
-        p:id="serializeUnsignedWayfAggregate">
+    <bean id="serializeUnsignedWayfAggregate" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/xml/ukfederation-wayf-unsigned.xml"/>
@@ -327,8 +315,7 @@
         </property>
     </bean>
     
-    <bean id="uk_wayfPipeline" parent="SimplePipeline"
-        p:id="uk_wayfPipeline">
+    <bean id="uk_wayfPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -376,8 +363,7 @@
         normal metadata in order to do its job.  This stage
         removes everything it does not need.
     -->
-    <bean id="CDSStripUnwanted" parent="CompositeStage"
-        p:id="CDSStripUnwanted">
+    <bean id="CDSStripUnwanted" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="stripComments"/>
@@ -406,8 +392,7 @@
         </property>
     </bean>
     
-    <bean id="CDSFinalise" parent="finalise_parent"
-        p:id="CDSFinalise">
+    <bean id="CDSFinalise" parent="finalise_parent">
         <property name="transformParameters">
             <map>
                 <entry key="extraText"
@@ -417,8 +402,7 @@
         </property>
     </bean>
     
-    <bean id="CDSNormaliseNamespaces" parent="XSLTransformationStage"
-        p:id="CDSNormaliseNamespaces">
+    <bean id="CDSNormaliseNamespaces" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/ns_norm_cds.xsl"/>
@@ -444,8 +428,7 @@
         <constructor-arg ref="commonNamespaces"/>
     </bean>
     
-    <bean id="serializeCDSAllAggregate" parent="SerializationStage"
-        p:id="serializeCDSAllAggregate">
+    <bean id="serializeCDSAllAggregate" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/xml/ukfederation-cdsall-unsigned.xml"/>
@@ -453,8 +436,7 @@
         </property>
     </bean>
     
-    <bean id="CDSAllPipeline" parent="SimplePipeline"
-        p:id="CDSAllPipeline">
+    <bean id="CDSAllPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -496,8 +478,7 @@
         ***********************************************
     -->
     
-    <bean id="uk_finaliseFallback" parent="finalise_parent"
-        p:id="uk_finaliseFallback">
+    <bean id="uk_finaliseFallback" parent="finalise_parent">
         <property name="transformParameters">
             <map>
                 <entry key="extraText" value="Feature fallback metadata; not for production use"/>
@@ -506,8 +487,7 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseFallback" parent="XSLTransformationStage"
-        p:id="uk_normaliseFallback">
+    <bean id="uk_normaliseFallback" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/ns_norm_back.xsl"/>
@@ -515,8 +495,7 @@
         </property>
     </bean>
     
-    <bean id="serializeUnsignedFallbackAggregate" parent="SerializationStage"
-        p:id="serializeUnsignedFallbackAggregate">
+    <bean id="serializeUnsignedFallbackAggregate" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/xml/ukfederation-back-unsigned.xml"/>
@@ -524,8 +503,7 @@
         </property>
     </bean>
     
-    <bean id="uk_fallbackPipeline" parent="SimplePipeline"
-        p:id="uk_fallbackPipeline">
+    <bean id="uk_fallbackPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -559,8 +537,7 @@
         ***************************************
     -->
     
-    <bean id="uk_finaliseTest" parent="finalise_parent"
-        p:id="uk_finaliseTest">
+    <bean id="uk_finaliseTest" parent="finalise_parent">
         <property name="transformParameters">
             <map>
                 <entry key="extraText" value="Feature test metadata; not for production use"/>
@@ -569,8 +546,7 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseTest" parent="XSLTransformationStage"
-        p:id="uk_normaliseTest">
+    <bean id="uk_normaliseTest" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/ns_norm_test.xsl"/>
@@ -578,8 +554,7 @@
         </property>
     </bean>
     
-    <bean id="serializeUnsignedTestAggregate" parent="SerializationStage"
-        p:id="serializeUnsignedTestAggregate">
+    <bean id="serializeUnsignedTestAggregate" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/xml/ukfederation-test-unsigned.xml"/>
@@ -587,8 +562,7 @@
         </property>
     </bean>
     
-    <bean id="uk_testPipeline" parent="CompositeStage"
-        p:id="uk_testPipeline">
+    <bean id="uk_testPipeline" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <!--
@@ -619,8 +593,7 @@
         *******************************************
     -->
     
-    <bean id="uk_finaliseExport" parent="finalise_parent"
-        p:id="uk_finaliseExport">
+    <bean id="uk_finaliseExport" parent="finalise_parent">
         <property name="transformParameters">
             <map>
                 <entry key="extraText" value="Export metadata for use by partner federations"/>
@@ -629,8 +602,7 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseExport" parent="XSLTransformationStage"
-        p:id="uk_normaliseExport">
+    <bean id="uk_normaliseExport" parent="XSLTransformationStage">
         <property name="XSLResource">
             <bean parent="FileSystemResource">
                 <constructor-arg value="${basedir}/mdx/uk/ns_norm_export.xsl"/>
@@ -643,8 +615,7 @@
         <constructor-arg ref="commonNamespaces"/>
     </bean>
     
-    <bean id="serializeUnsignedExportAggregate" parent="SerializationStage"
-        p:id="serializeUnsignedExportAggregate">
+    <bean id="serializeUnsignedExportAggregate" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/xml/ukfederation-export-unsigned.xml"/>
@@ -652,8 +623,7 @@
         </property>
     </bean>
     
-    <bean id="uk_exportPipeline" parent="SimplePipeline"
-        p:id="uk_exportPipeline">
+    <bean id="uk_exportPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -665,7 +635,7 @@
                     have the ExportOptIn label: in other words, a rule in this section
                     can always be overridden by an explicit ExportOptIn.
                 -->
-                <bean p:id="exclusion" parent="SplitMergeStage">
+                <bean id="exclusion" parent="SplitMergeStage">
                     
                     <!-- select entities with ExportOptIn label -->
                     <property name="selectionStrategy">
@@ -679,7 +649,7 @@
                         Pipeline for selected (explicitly opted in) items.
                     -->
                     <property name="selectedItemPipeline">
-                        <bean p:id="selectedItemPipeline" parent="SimplePipeline">
+                        <bean id="selectedItemPipeline" parent="SimplePipeline">
                             <property name="stages">
                                 <list>
                                     <!-- nothing required -->
@@ -693,12 +663,12 @@
                         matching specific rules.
                     -->
                     <property name="nonselectedItemPipeline">
-                        <bean p:id="nonSelectedItemPipeline" parent="SimplePipeline">
+                        <bean id="nonSelectedItemPipeline" parent="SimplePipeline">
                             <property name="stages">
                                 <list>
                                     
                                     <!-- Identity providers lacking support for SAML 2.0 -->
-                                    <bean p:id="SAML1onlyIdPs" parent="XPathFilteringStage"
+                                    <bean id="SAML1onlyIdPs" parent="XPathFilteringStage"
                                         p:XPathExpression="md:IDPSSODescriptor
                                         [not(contains(@protocolSupportEnumeration,'urn:oasis:names:tc:SAML:2.0:protocol'))]">
                                     </bean>
@@ -707,16 +677,16 @@
                                     <!--
                                         Preferred implementation:
                                         
-                                        <bean p:id="syntheticScopes" parent="XPathFilteringStage"
+                                        <bean id="syntheticScopes" parent="XPathFilteringStage"
                                             p:XPathExpression="shibmd:Scope[ends-with(., '.eng.ukfederation.org.uk']"/>
                                         
                                         Unfortunately, the "ends-with" function is an XPath 2 feature, so we settle for
                                         using "contains" instead; in our case it is equivalent.
                                     -->
-                                    <bean p:id="syntheticScopes" parent="XPathFilteringStage"
+                                    <bean id="syntheticScopes" parent="XPathFilteringStage"
                                         p:XPathExpression="//shibmd:Scope[contains(., '.eng.ukfederation.org.uk')]"/>
                                     <!-- Specific providers not caught by the previous condition -->
-                                    <bean p:id="GlowScotland" parent="EntityFilterStage">
+                                    <bean id="GlowScotland" parent="EntityFilterStage">
                                         <property name="designatedEntities">
                                             <set>
                                                 <value>https://idp.glowscotland.org.uk/shibboleth</value>
@@ -725,7 +695,7 @@
                                     </bean>
                                     
                                     <!-- Identity providers with regular expression scopes -->
-                                    <bean p:id="regexScopes" parent="XPathFilteringStage"
+                                    <bean id="regexScopes" parent="XPathFilteringStage"
                                         p:XPathExpression="//shibmd:Scope[@regexp='true']"/>
                                 </list>
                             </property>
@@ -776,8 +746,7 @@
         <constructor-arg ref="commonNamespaces"/>
     </bean>
     
-    <bean id="uk_exportPreviewPipeline" parent="SimplePipeline"
-        p:id="uk_exportPreviewPipeline">
+    <bean id="uk_exportPreviewPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
 
@@ -790,7 +759,7 @@
                     have the ExportOptIn label: in other words, a rule in this section
                     can always be overridden by an explicit ExportOptIn.
                 -->
-                <bean p:id="exclusion" parent="SplitMergeStage">
+                <bean id="exclusion" parent="SplitMergeStage">
 
                     <!-- select entities with ExportOptIn label -->
                     <property name="selectionStrategy">
@@ -804,7 +773,7 @@
                         Pipeline for selected (explicitly opted in) items.
                     -->
                     <property name="selectedItemPipeline">
-                        <bean p:id="selectedItemPipeline" parent="SimplePipeline">
+                        <bean id="selectedItemPipeline" parent="SimplePipeline">
                             <property name="stages">
                                 <list>
                                     <!-- nothing required -->
@@ -818,12 +787,12 @@
                         matching specific rules.
                     -->
                     <property name="nonselectedItemPipeline">
-                        <bean p:id="nonSelectedItemPipeline" parent="SimplePipeline">
+                        <bean id="nonSelectedItemPipeline" parent="SimplePipeline">
                             <property name="stages">
                                 <list>
 
                                     <!-- Identity providers lacking support for SAML 2.0 -->
-                                    <bean p:id="SAML1onlyIdPs" parent="XPathFilteringStage"
+                                    <bean id="SAML1onlyIdPs" parent="XPathFilteringStage"
                                         p:XPathExpression="md:IDPSSODescriptor
                                             [not(contains(@protocolSupportEnumeration,'urn:oasis:names:tc:SAML:2.0:protocol'))]">
                                     </bean>
@@ -832,16 +801,16 @@
                                     <!--
                                         Preferred implementation:
                                         
-                                        <bean p:id="syntheticScopes" parent="XPathFilteringStage"
+                                        <bean id="syntheticScopes" parent="XPathFilteringStage"
                                             p:XPathExpression="shibmd:Scope[ends-with(., '.eng.ukfederation.org.uk']"/>
                                         
                                         Unfortunately, the "ends-with" function is an XPath 2 feature, so we settle for
                                         using "contains" instead; in our case it is equivalent.
                                     -->
-                                    <bean p:id="syntheticScopes" parent="XPathFilteringStage"
+                                    <bean id="syntheticScopes" parent="XPathFilteringStage"
                                         p:XPathExpression="//shibmd:Scope[contains(., '.eng.ukfederation.org.uk')]"/>
                                     <!-- Specific providers not caught by the previous condition -->
-                                    <bean p:id="GlowScotland" parent="EntityFilterStage">
+                                    <bean id="GlowScotland" parent="EntityFilterStage">
                                         <property name="designatedEntities">
                                             <set>
                                                 <value>https://idp.glowscotland.org.uk/shibboleth</value>
@@ -850,7 +819,7 @@
                                     </bean>
 
                                     <!-- Identity providers with regular expression scopes -->
-                                    <bean p:id="regexScopes" parent="XPathFilteringStage"
+                                    <bean id="regexScopes" parent="XPathFilteringStage"
                                         p:XPathExpression="//shibmd:Scope[@regexp='true']"/>
                                 </list>
                             </property>
@@ -883,7 +852,7 @@
                 <ref bean="check_namespaces"/>
                 <ref bean="errorTerminatingFilter"/>
                 
-                <bean parent="SerializationStage" p:id="serializeUnsignedExportPreviewAggregate">
+                <bean id="serializeUnsignedExportPreviewAggregate" parent="SerializationStage">
                     <property name="outputFile">
                         <bean class="java.io.File">
                             <constructor-arg value="${basedir}/xml/ukfederation-export-preview-unsigned.xml"/>
@@ -917,8 +886,7 @@
         normal metadata in order to do its job.  This stage
         removes everything it does not need.
     -->
-    <bean id="CMSStripUnwanted" parent="CompositeStage"
-        p:id="CMSStripUnwanted">
+    <bean id="CMSStripUnwanted" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="stripComments"/>
@@ -948,8 +916,7 @@
         </property>
     </bean>
     
-    <bean id="CMSFinalise" parent="finalise_parent"
-        p:id="CMSFinalise">
+    <bean id="CMSFinalise" parent="finalise_parent">
         <property name="transformParameters">
             <map>
                 <entry key="extraText"
@@ -959,8 +926,7 @@
         </property>
     </bean>
     
-    <bean id="serializeCMSAggregate" parent="SerializationStage"
-        p:id="serializeCMSaggregate">
+    <bean id="serializeCMSAggregate" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/xml/cms-metadata.xml"/>
@@ -968,8 +934,7 @@
         </property>
     </bean>
     
-    <bean id="CMSPipeline" parent="SimplePipeline"
-        p:id="CMSPipeline">
+    <bean id="CMSPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!-- make an aggregate first so that we're only traversing one item -->
@@ -1000,8 +965,7 @@
         *************************************
     -->
     
-    <bean id="generate" parent="SimplePipeline"
-        p:id="generate">
+    <bean id="generate" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -1026,8 +990,7 @@
                     Fork new output pipelines for the registrar statistics and for
                     the CMS aggregate.
                 -->
-                <bean id="rawRegistrarDemux" parent="PipelineDemultiplexerStage"
-                    p:id="rawRegistrarDemux">
+                <bean id="rawRegistrarDemux" parent="PipelineDemultiplexerStage">
                     <property name="pipelineAndSelectionStrategies">
                         <list>
                             <bean class="net.shibboleth.utilities.java.support.collection.Pair">
@@ -1071,8 +1034,7 @@
                     metadata as closely as possible, so the fork must happen before
                     too many UK-specific transformations are performed.
                 -->
-                <bean id="registrarDemux" parent="PipelineDemultiplexerStage"
-                    p:id="registrarDemux">
+                <bean id="registrarDemux" parent="PipelineDemultiplexerStage">
                     <property name="pipelineAndSelectionStrategies">
                         <list>
                             <bean class="net.shibboleth.utilities.java.support.collection.Pair">
@@ -1109,8 +1071,7 @@
                     Merge in entities from production metadata exchange sources.
                 -->
                 
-                <bean id="mergeProductionMDXEntities" parent="PipelineMergeStage.deduplicate"
-                    p:id="mergeProductionMDXortedEntities">
+                <bean id="mergeProductionMDXEntities" parent="PipelineMergeStage.deduplicate">
                     <property name="mergedPipelines">
                         <list>
                             <!-- entries earlier in the list have higher precedence -->
@@ -1135,8 +1096,7 @@
                 <!--
                     Fork into new pipelines for the production, fallback and WAYF aggregates.
                 -->
-                <bean id="productionDemux" parent="PipelineDemultiplexerStage"
-                    p:id="productionDemux">
+                <bean id="productionDemux" parent="PipelineDemultiplexerStage">
                     <property name="pipelineAndSelectionStrategies">
                         <list>
                             <bean class="net.shibboleth.utilities.java.support.collection.Pair">
@@ -1166,8 +1126,7 @@
                     Merge in entities from pre-production metadata exchange sources.
                 -->
 
-                <bean id="mergePreproductionMDXEntities" parent="PipelineMergeStage.deduplicate"
-                    p:id="mergePreproductionMDXEntities">
+                <bean id="mergePreproductionMDXEntities" parent="PipelineMergeStage.deduplicate">
                     <property name="mergedPipelines">
                         <list>
                             <!-- entries earlier in the list have higher precedence -->
@@ -1192,8 +1151,7 @@
                 <!--
                     Fork into new pipelines for additional aggregates.
                 -->
-                <bean id="preProductionDemux" parent="PipelineDemultiplexerStage"
-                    p:id="preProductionDemux">
+                <bean id="preProductionDemux" parent="PipelineDemultiplexerStage">
                     <property name="pipelineAndSelectionStrategies">
                         <list>
                             <bean class="net.shibboleth.utilities.java.support.collection.Pair">
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 21669b66..ead03397 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -35,8 +35,7 @@
         
         Stand-alone statistics generation.
     -->
-    <bean id="statistics" parent="SimplePipeline"
-        p:id="statistics">
+    <bean id="statistics" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
@@ -53,22 +52,19 @@
         Generates a page of links to discovery services, for each SP that
         has mdui:uiinfo metadata.
     -->
-    <bean id="sp_mdui_test" parent="SimplePipeline"
-        p:id="sp_mdui_test">
+    <bean id="sp_mdui_test" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
                 <ref bean="assemble"/>
-                <bean id="process" parent="XSLTransformationStage"
-                    p:id="process">
+                <bean id="process" parent="XSLTransformationStage">
                     <property name="xslResource">
                         <bean parent="ClassPathResource">
                             <constructor-arg value="uk/sp_mdui_test.xsl"/>
                         </bean>
                     </property>
                 </bean>
-                <bean id="serialize" parent="SerializationStage"
-                    p:id="serialize">
+                <bean id="serialize" parent="SerializationStage">
                     <property name="outputFile">
                         <bean class="java.io.File">
                             <constructor-arg value="${basedir}/mdx/uk/temp.html"/>
@@ -87,8 +83,7 @@
         ***********************
     -->
     
-    <bean id="verify" parent="SimplePipeline"
-        p:id="verify">
+    <bean id="verify" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -119,8 +114,7 @@
         *********************************
     -->
     
-    <bean id="checkPorts" parent="SimplePipeline"
-        p:id="checkPorts">
+    <bean id="checkPorts" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
@@ -152,8 +146,7 @@
         ***********************************
     -->
     
-    <bean id="checkFuture" parent="SimplePipeline"
-        p:id="checkFuture">
+    <bean id="checkFuture" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
@@ -175,8 +168,7 @@
                     Additional X.509 certificate checks, over and above those
                     performed in uk_registeredEntities.
                 -->
-                <bean parent="X509ValidationStage"
-                    p:id="checkCertificates">
+                <bean id="checkCertificates" parent="X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- none at present -->
@@ -204,8 +196,7 @@
         Fetches the contents of the file used to hold metadata to be imported
         into a UK federation fragment file.
     -->
-    <bean id="fetchImportMetadata" parent="DOMFilesystemSourceStage"
-        p:id="fetchImportMetadata">
+    <bean id="fetchImportMetadata" parent="DOMFilesystemSourceStage">
         <property name="source">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/entities/import.xml"/>
@@ -218,8 +209,7 @@
         
         Serialise the fragment file just imported.
     -->
-    <bean id="serializeImportedMetadata" parent="SerializationStage"
-        p:id="serializeImportedMetadata">
+    <bean id="serializeImportedMetadata" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/entities/imported.xml"/>
@@ -234,8 +224,7 @@
         
         For now, just the head of that pipeline.
     -->
-    <bean id="import.metadata" parent="SimplePipeline"
-        p:id="import.metadata">
+    <bean id="import.metadata" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <!-- fetch the input file -->
@@ -250,8 +239,7 @@
                 <ref bean="uk_fix_mailto"/>
                 
                 <!-- transform into a fragment using our local conventions -->
-                <bean id="importTransform" parent="XSLTransformationStage"
-                    p:id="importTransform">
+                <bean id="importTransform" parent="XSLTransformationStage">
                     <property name="XSLResource">
                         <bean parent="ClassPathResource">
                             <constructor-arg value="uk/import.xsl"/>
@@ -260,8 +248,7 @@
                 </bean>
                 
                 <!-- normalise namespaces in a specific way -->
-                <bean id="normalizeFragment" parent="XSLTransformationStage"
-                    p:id="normalizeFragment">
+                <bean id="normalizeFragment" parent="XSLTransformationStage">
                     <property name="XSLResource">
                         <bean parent="FileSystemResource">
                             <constructor-arg value="${basedir}/mdx/uk/ns_norm_fragment.xsl"/>
@@ -297,8 +284,7 @@
                 <ref bean="check_shibboleth"/>
                 <ref bean="check_uk_trust"/>
                 
-                <bean parent="X509ValidationStage"
-                    p:id="checkCertificates">
+                <bean id="checkCertificates" parent="X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
@@ -348,8 +334,7 @@
         #################################################
     -->
     
-    <bean id="serializeImported" parent="SerializationStage"
-        p:id="serializeImported">
+    <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/mdx/uk/imported.xml"/>
@@ -357,8 +342,7 @@
         </property>
     </bean>
     
-    <bean id="importExported" parent="SimplePipeline"
-        p:id="importExported">
+    <bean id="importExported" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_exportedEntities"/>
@@ -369,8 +353,7 @@
         </property>
     </bean>
     
-    <bean id="importExportedRaw" parent="SimplePipeline"
-        p:id="importExportedRaw">
+    <bean id="importExportedRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_exportAggregate"/>
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index 5f6fb3a6..749202da 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -31,8 +31,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="us_incommon_productionAggregate" parent="DOMResourceSourceStage"
-        p:id="us_incommon_productionAggregate">
+    <bean id="us_incommon_productionAggregate" parent="DOMResourceSourceStage">
         <property name="DOMResource">
             <bean parent="HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
@@ -50,8 +49,7 @@
     <!--
         Check InCommon signing signature.
     -->
-    <bean id="us_incommon_checkSignature" parent="XMLSignatureValidationStageSHA256"
-        p:id="us_incommon_checkSignature">
+    <bean id="us_incommon_checkSignature" parent="XMLSignatureValidationStageSHA256">
         <property name="verificationCertificate" ref="us_incommon_signingCertificate"/>
     </bean>
 
@@ -61,8 +59,7 @@
         Any registrationAuthority already present on an entity in this
         channel must match the known registration authority value.
     -->
-    <bean id="us_incommon_check_regauth" parent="check_regauth_parent"
-        p:id="us_incommon_check_regauth">
+    <bean id="us_incommon_check_regauth" parent="check_regauth_parent">
         <property name="transformParameters">
             <map>
                 <entry key="expectedAuthority" value-ref="us_incommon_registrar"/>
@@ -76,8 +73,7 @@
         Provide a default registrationAuthority appropriate to
         this channel.
     -->
-    <bean id="us_incommon_default_regauth" parent="default_regauth_parent"
-        p:id="us_incommon_default_regauth">
+    <bean id="us_incommon_default_regauth" parent="default_regauth_parent">
         <property name="transformParameters">
             <map>
                 <entry key="defaultAuthority" value-ref="us_incommon_registrar"/>
@@ -88,8 +84,7 @@
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="us_incommon_productionEntities" parent="CompositeStage"
-        p:id="us_incommon_productionEntities">
+    <bean id="us_incommon_productionEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="us_incommon_productionAggregate"/>
@@ -111,8 +106,7 @@
     <!--
         Synthesise an export collection by filtering the production entities.
     -->
-    <bean id="us_incommon_exportedEntities" parent="CompositeStage"
-        p:id="us_incommon_exportedEntities">
+    <bean id="us_incommon_exportedEntities" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="us_incommon_productionAggregate"/>
@@ -139,9 +133,8 @@
                 <!--
                     Filter out all entities not involved in the pilot.
                 -->
-                <bean parent="stage_parent"
+                <bean id="us_incommon_pilot_filterEntities" parent="stage_parent"
                     class="net.shibboleth.metadata.dom.saml.EntityFilterStage"
-                    p:id="us_incommon_pilot_filterEntities"
                     p:whitelistingEntities="true">
                     <property name="designatedEntities">
                         <set>
@@ -154,9 +147,8 @@
                 <!--
                     Remove all contact information.
                 -->
-                <bean parent="stage_parent"
+                <bean id="us_incommon_remove_contacts" parent="stage_parent"
                     class="net.shibboleth.metadata.dom.saml.ContactPersonFilterStage"
-                    p:id="us_incommon_remove_contacts"
                     p:whitelistingTypes="true">
                     <property name="designatedTypes">
                         <set>
@@ -183,8 +175,7 @@
     <!--
         Fake an export aggregate by aggregating the exported entities.
     -->
-    <bean id="us_incommon_exportedAggregate" parent="CompositeStage"
-        p:id="us_incommon_exportedAggregate">
+    <bean id="us_incommon_exportedAggregate" parent="CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="us_incommon_exportedEntities"/>
diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml
index b7d551a5..3a438a8b 100644
--- a/mdx/us_incommon/verbs.xml
+++ b/mdx/us_incommon/verbs.xml
@@ -25,8 +25,7 @@
     <!--
         Serialise into this channel's "imported" aggregate file.
     -->
-    <bean id="serializeImported" parent="SerializationStage"
-        p:id="serializeImported">
+    <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="${basedir}/mdx/us_incommon/imported.xml"/>
@@ -34,8 +33,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="SimplePipeline"
-        p:id="importProduction">
+    <bean id="importProduction" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="us_incommon_productionEntities"/>
@@ -46,8 +44,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="SimplePipeline"
-        p:id="importProductionRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="us_incommon_productionAggregate"/>
@@ -56,8 +53,7 @@
         </property>
     </bean>
     
-    <bean id="importExported" parent="SimplePipeline"
-        p:id="importExported">
+    <bean id="importExported" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="us_incommon_exportedEntities"/>
@@ -68,8 +64,7 @@
         </property>
     </bean>
     
-    <bean id="importExportedRaw" parent="SimplePipeline"
-        p:id="importExportedRaw">
+    <bean id="importExportedRaw" parent="SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="us_incommon_exportedAggregate"/>