Continuing fixes to port to PSR-0.