Ref T13216. Ref T13217. Depends on D19800. This fixes all of the remaining query warnings that pop up when you run "arc unit --everything".
There's likely still quite a bit of stuff lurking around, but hopefully this covers a big set of the most common queries.
Ran arc unit --everything. Before change: lots of query warnings. After change: no query warnings.
Failing because it depends on %Z and %LK in D19800.