Remove anaphoric macros

Review 1005 by @mlucy
Closes #806