Get rid of C style macros