Work necessary to make PHPCI PSR2 compliant.