Smarter parsing of macro bodies