(Greatly) reduced PHP Warning count