Fixes for PHP 5.3 and PSR2 compliance.