Reorganizing macros.