Changes for the new pretty printing system in debian-3.84