(and I still think you could move the "delete thread" change to the other bug...)