Use macros for newly added optimizations.