More improvements to fix handling of IntExpr