am d60a625d: Merge "Start moving 32-bit cruft somewhere it won\'t pollute 64-bit."

* commit 'd60a625dd5e544fb49056d864898ff82bca99950':
  Start moving 32-bit cruft somewhere it won't pollute 64-bit.