Handle function style macros more correctly.