Fix mistaken use of xor in "2^31 - 1".
Merge pull request #568 from jmgao/patch-2

Fold constant expression into constant.