Updating handling of merged vs remerged jobs (fifth time is a charm.)  This isn't pretty, but I think it's correct.