For future reference, turning the macro into an inline function would have resolved the conflict as well.

(Sorry, didn't see the PR until now - still catching up on my GH email.)