Thank you for reporting this issue. I think what you shared makes a lot of sense and we cannot asumme that substituting one type of collection with another will work all of the time.
I created this ticket to refine the behavior of S4738. But beware this task is big one that covers cases that go beyond the ones you shared so it might take a little while before we address it.
Still, let me know if you can think of other cases, I will be happy to update the ticket.