Improve pretty-printing.