Are we dropping the use of STATE_WAITING for None?