Better handling of macros in the C code generator.