Code cleanup for track map filtering.