I've pushed my changes to lp:~doxxx/bzr/output-cleanup. I'm still running the selftest to see if I've broken anything. Once that finishes, I'll make a merge proposal, probably tomorrow morning. Ciao, Gordon