More PHPCS fixes from content versioning