Extending handling of complex XSD types, but still lots to go.