shrink `make-query-then-exec`