Finish refactoring with "translate" taken into account.