cleanup calculators to use new "Set"-based superlists