More removal of PHP Notices.