[WIP] Query constructor API changes

I wasn't aware that the server team planned to require `$query` in the future. I don't see the harm in always using it, though. It helps keep our query documents consistent regardless of whether modifiers are used.