More syntax changes to please PHPCS