Simplify query parser.