Various pretty printer improvements.