Did some refactoring of the set comprehension strategy used to transform the OO AST