Import QueryParserSpec fix from extractors branch.