Simplify list vs set lookups, clearer slices