Changed r->subsumers to Set. Additionally, bugfix, the macros from the previous commit were buggy.