Updating code to work with 8.3. PHPCS cleanup.