Remove no-longer necessary dynamic disjoint sets.
Clean up compiler warnings, etc.