Merge in PHP5 strict changes that are applicable to PHP4.