Possibly better integer handling for macros / fix for 32-bit
Actually check for >= 3.3, update headers to use 3.4