Tweaks to printing the diff in BFM