Add expand-macro generic