Refactor URI-based matcher for legibility