Re-added some macros.