Rob Willett's type tweaks for 64-bit XCode