This change looks hackish and fixing CommonTermsQuery to handle several terms at the same position looks hard to me (eg. if one of the terms has a high freq and another one has a low freq) so maybe we should just leave CommonTermsQuery as-is and state in the doc that when commonTermsCutoff is set, tokens at the same position won't be handled gracefully?