Add some heuristics to support detecting merges.