Avoid using EQUS when EQU or MACRO will do (#496)

Avoid using EQUS when EQU or MACRO will do (#496) #526