Cleanup to make compiling on 32 bit easier.