I think he replied to his own question, there are a few with 1-on-1 only in his reply.

But on his point that it's more work to remove groups than to add groups, I'd argue that NIP 17 groups are like fake groups, nobody can leave or join without breaking the group, so they should be removed for that reason instead, everything to MLS.