Simplify some macros