Small translate refactoring