t660: make span tag removal more robust.