Improve error message
Add unshadowing for CoreExprEquality