Clean up uses of the old __P() macro.