fix markup.variables, markup.macros to use new notation