Fix bug introduced with warning cleanup where objects weren't all cleaned up.