Move ConstantExpr handling to ResolveConstantExpr method and also