Moved term containment checking into Query classes.