Cleaned up a number of warnings exposed by recent migration to PHP 5.2