Progress on query forall parsing.