Comment 2 for bug 1745231

@Anastasia I thought about filtering out dead models from the query, but I'm not sure that's quite sufficient, as then there can be a race between the query and a model being removed - the model might not have been dead when we issued the query, but could be when we get around to asking for it.