Minor cleanup of Track.