USRs for macros were not cannonical due to usage of cursor location instead of definition location.
Thanks for fixing this Kadir!
LGTM