Fix PHPCS errors, take 2.