am d51730a6: Merge "Help catch common 32/64-bit errors."

* commit 'd51730a64fac296f42f28ac84feca02a9ee6ef15':
  Help catch common 32/64-bit errors.