Use inline macros in some places
Correctly parse comments inside macros