Improvements to pretty-printing of Core