CS fixes, with Fabien Potencier's "Code Style Fixer"