Adjust for new form of compare&exchange macros.