Work is being done on User-related query optimizations. To help ensure

the changes have an effect on queries, we're now using the new

assertQueries() for all User unit tests that otherwise assert non-0

query counts.
This lets us check the specifics of the queries, including details on

JOINs, annotations, fields that are queried, and more. Further

improvements to this functionality will be more easily verified through

unit test changes and in code reviews.

Unit tests pass.