add unicode comparison support in macros

Trying again