Merge "Revert "ExpatParser LP64 fixes.""