Lots of bit-specific type work to fix compilation on older OSes.
Further changes to bit-specific types for building on older OSes.
Merge branch 'maint'