XSD: Begin using output of phase-approach.
Some cleanup should follow, when we're more sure of the new stuff.