Toon,
At the moment, I am content just to point out the problems and
suggest putative fixes without actually constructing the patches.
Some of what I am looking at are warnings in the 64-bit builds anyway
which need to be discussed as to the proper approach.
Jack