Merge "Make intraline differences easier to debug"