WyC: Various fixes related to pretty printing.