Readd misc macros.