Fix macro argument names colliding with context variable names. Fixes gh-457