Replaced some numeric literals with the macros MILLION, THOUSAND, etc.