XSD: Get complexContent et al. more in line with spec.