Removing extraneous ToQuery instances :)