"The language we proposed also raised question about whether your photos can be part of an advertisement. We do not have plans for anything like this and because of that we’re going to remove the language that raised the question."
I think they deserve a little patience and a chance to follow through with their promise. When they do, we can see how villainous the terms still are. And if they don't keep their promise, we can call them on it.