Factor-out common code with a new macro
2 files changed