Regenerated JAXB after redesign of XSD, not final version.