Yet more PSR compliance