Did some refactoring of assistants used for transformations of the OO AST