PSR-2 conformance fixes. I hate PSR-2.