fix trackstate at first and last hit to actually require hits

[alspellm]

Previously, AtFirstHit and AtLastHit track states used measurement sites, not sites with hits. Fixed this.