Clean up combinatorial helpers.