Simplify implementation of is_disjoint/is_subset
Tidy up store implementations