Fix more PSR-0 errors.