Refactor MacroConstantsGenerator interface