Parser now outputs whole queries and clauses.