Consolidate macros, remove 32bit limit on scanf results
remove 32bit limit on scanf results