Premature optimization.
PHPDoc Changes
Fix for Ticket 846