Move default macros into core.