Better output, now robust to emacs temp files