Start refactoring decorator to work over standard XML.