PSR2 CS fixes

No semantics changes, so it shouldn't be the cause of any new issues.