Simplify partition selector: from breischl