Tidy up pretty-printing (use ppUnless)