Some modest optimizations
Macro priority test