Found this while trying to build everything on OS X x86-64. Seemed simplest to just fix the 64-bit code path to match the 32-bit one.
This was fixed by r636 anyway.