somewhat simplify query-parser (2)