Call generator refactoring