More tweaks to aid usability of diff tools