Reorganized macros.