Get rid of == macro