Refactor and rename query combinators