Use fewer macros