Backport from paradise/macros

review @paulp @retronym