Get rid of WAITING_*

m8