invalid us-core-race and us-core-ethnicity extensions in STU3 synthetic Patient data

[jschneid-nmdp]

The us-core-race and us-core-ethnicity extensions both use a nested extension structure:

https://hl7.org/implement/standards/fhir/us/core/STU2/StructureDefinition-us-core-race.html
http://hl7.org/implement/standards/fhir/us/core/STU2/StructureDefinition-us-core-ethnicity.html

However, some of the https://r3.smarthealthit.org synthetic Patient data uses (incorrectly) valueCodeableConcept for those extensions.

For example, in Patient https://r3.smarthealthit.org/Patient/f0462936-eb4b-4da1-b45a-fbd96ebf8ccb the (incorrect) us-core-race and us-core-ethnicity extensions look like this (valueCodeableConcept):

  "extension": [
    {
      "url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-race",
      "valueCodeableConcept": {
        "coding": [
          {
            "system": "http://hl7.org/fhir/v3/Race",
            "code": "2106-3",
            "display": "White"
          }
        ],
        "text": "race"
      }
    },
    {
      "url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity",
      "valueCodeableConcept": {
        "coding": [
          {
            "system": "http://hl7.org/fhir/v3/Ethnicity",
            "code": "2186-5",
            "display": "Nonhispanic"
          }
        ],
        "text": "ethnicity"
      }
    },
...

... but they should look more like this (nested extensions):

  "extension": [
    {
      "url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-race",
      "extension": [
        {
          "url": "ombCategory",
          "valueCoding": {
            "system": "urn:oid:2.16.840.1.113883.6.238",
            "code": "2106-3",
            "display": "White"
          }
        },
        {
          "url": "text",
          "valueString": "white"
        }
      ]
    },
    {
      "url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity",
      "extension": [
        {
          "url": "ombCategory",
          "valueCoding": {
            "system": "urn:oid:2.16.840.1.113883.6.238",
            "code": "2186-5",
            "display": "Non Hispanic or Latino"
          }
        },
        {
          "url": "text",
          "valueString": "non-Hispanic"
        }
      ]
    },
...

Several examples of synthetic Patient data with this problem are:

https://r3.smarthealthit.org/Patient/f0462936-eb4b-4da1-b45a-fbd96ebf8ccb
https://r3.smarthealthit.org/Patient/008076b8-7fba-4645-ba41-0b8ffe10e82b
https://r3.smarthealthit.org/Patient/eb3271e1-ae1b-4644-9332-41e32c829486

If possible, please revise the synthetic Patient data to correctly represent the us-core-race and us-core-ethnicity extensions.