Simplify QueryParsers using new parser features.