move back to XMLInfrastructure instance usage as DOM+XPath is reinstated and optimized