CS fixes

Reported as https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/750