Fixed self references in macros
4 files changed