Rewrote some macros.