How about HAS_REMOVE_THREAD_STATE since that's actually what we're adding here?