Minor code cleanup.

I can't have a union element called 'bool' that works with Obj-C or C++
or versions of C that include a bool type! I also dropped a few warnings
I was seeing when compiling from Xcode.