Merged possible crash fixes back to main parser work.
More places which have a long/void* mismatch causing win64 to crash. Partially done, testsuite not updated.