Move the Xml_wrapped module out. Remove Wrapped functors.