Tweak a few PSR-2 issues.