Minor CS fixes due to PHPCS updates