some fixes for macros: one esoteric, and one quite critical

review @retronym