[transforms] Refactoring... part 9, the last one