Removed more PHP-specific bits.