Fixed more problems with PHPCS 2.0.0RC4