aggreg: refactor stuff, switch to unordered_set