Further fix skipped count by only uniquely counting origins, not the entire line (this now matches 2.3.x much more)