catch_queries() now looks for any subqueries as part of a query,

tracking them and nesting them in the appropriate parent query or

subquery. This works for a nested DISTINCT query, annotations,

aggregations, and filtering, at any depth.
This will soon be used by compare_queries() to do thorough subquery

comparisons.

Unit tests pass.
Made use of this in the upcoming work on subquery comparisons.