Nuke some more __P macros.