Refactor.

And also make the diff_* functions behave consistently and more like
the real diff by printing the diff (not that the printing is what
makes the refactoring possible).