Move anaphoric macros to contrib module