Optimize some macros