More work on mapping comparison diff output