Make shipment respect mailpiece type too