Yet another attempt to narrow the track region and reduce compile warnings.