Improve pretty_diff implementations

Makes --trace much more useful