Fix: Analyzer supports macros correctly now