Ignore differences between 32-bit and 64-bit ints

An attempt to partially fix #2010.