Improve pretty-printing slightly