Small improvements to query builder

Nicer one-liners that reuse existing code.

This also avoids the problem I have in issue https://github.com/vadimtsushko/objectory/issues/46 (i.e. it didn't mark query as "set", but now it does).