Fix llvm-gcc warnings.

This also corrects a previous change that
caused problems on python 2.4 and 32 bit systems.