More PSR-2 cleanup