Returned the partially built query, making the callback optional.  Added a comment to provide context.