Slight overhaul of the pretty printer