CLEANUP: Simplified XSD canonical mapping wrapper.