Refactoring on macro paradise using the Macro trait