If you want to rework it that would be great. It would be nice to keep changes minimal and I don't think cgi.escape will confuse difflib too much.

If not, I'll get around to it eventually :)