[New] Moved *Visitor transformations in query into query method
This is better than keeping the Visitor in the instance of the query,
where it might be to early to instantiate it.