XSD: Handle element conversion better and more complete (split into two steps).