Fixed double-evaluation bug in comparison macros.