together with AND or OR. (This is part of bug 647649 but fixes a test failure
caused by bug 656994 so is being checked in now.)