Fix to allow later 4.x schema XPath that doesn't require /fields/ or /types/