These three changes compile but I don't know whether thay succeed in suppressing the new static analyzer complaints.