Respecting PSR-2