Changed result of diff mapper to use collapseddiffobj to see if that could avoid the need to recurse parse result tree.