Deal with -Wtautological-constant-out-of-range-compare

Happens on OS X 10.9

Fixes #1710 (hopefully)