Minor CS fixes as of PSR-2