Cleaned up references that caused problems for PHP 4.4.x or 5.0.5.