Revert back to PHP 5.4+ compatibility.
Applying coding standards for PHP 5.4+.