Minor CS fixes as of PHPCS