Remove short-circuiting from FIX_EQ macros
Update APIs and macros to have more consistent naming