minor performance update in match-ctx