Remove CreateQuery and simplify chain.