Make state explicit again.