WyC: More little tweaks for pretty printer.  #174