fix: #2204, #2211 resolve loop

[technohippy]

⯈fix: #2204
⯈fix: #2211

• I've read the contributing guidelines
• I've added my name and email to the NOTICE file

[romdotdog]

You should use an O(1) Set<Expression> instead of an Expression[]

[dcodeIO]

Thanks! :)