Reorganizing the macros for the C interface.