Macros utilities: add map-macro