I'm just going to close this since we've converted most of the Query classes by now and are fixing the remaining ones as adjacent work happens. These changes were just minor improvements to code clarity and there's no particular urgency to fully modernizing things, nor do we get to delete a bunch of code once we're done or reduce maintenance costs in a global way or anything like that.