Revert the ConstantInt constructors back to their 2.5 forms where possible, thanks...