Even more refactoring to eliminate the concept of a track type...