KAS: refactored to deal with changes to TrackPropEnum.