Simplify macros