Introduce sets::LookupSet
Various fixed & unification