Adapted TX refactorings in SGE.