Fix @somatonic issue #378 where certain types of selectors with OR values had remaining selectors get bunched into the OR.