Switch to new IParserDescriptor API, still a bug with some "HasItems" cases.