This isn't removing a macro work-around, right? Would it be possible to have the macro stuff and the #5922 stuff in separate commits?