Ensure aliases from macros are properly expanded, closes #1123