php: minor changes from rawhide