Returning queries and params instead of mutating - per @radix
removed unwanted comment - thanks @cyli
clearer comments - for @radix :)