Use a simpler constructor when constructing ConstantInt. Also, replace