These two methods are a bit excessive. Prefer to just inline them where they are used below. Less code, less API surface, and they are only used in one place. It also makes the code in eventnavigatorsource more readable as someone will be able to see the exact event types that match without having to then come to this file to look them up.