Reorganized Boolean grouping.