Improve error pretty-printing