Remove some unnecessary (and wrong) macro defines.