Properly parse and navigate macros