Yet more __P() macros have been removed. Check the commits record around the 13th to see. __P() should now be gone most everywhere except contrib.