Backport from paradise/macros

Follow-up for https://github.com/scala/scala/pull/2577. Review @paulp @retronym