Remove some dubious underscores on int constant macros.