Get rid of the last ATOMIC macro uses