Improve pretty-printing of Core