Simplify some macros.