Used XMacros to reduce surprises. Fixed operators priorities.