Update for new pretty printing code in debian-3.84