Forgotten changes that should have been part of the r45368 64-bit fix.