Replace last occurrence of the deprecated match_ext() with