64-bit tests now pass (well, nearly).