Hopefully fix a race condition introduced in the performance refactoring.
Include the track name in equality checks.
Some further performance improvements.