Updating code to reflect XMLSCHEMA-33 and XMLSCHEMA-35.