Looking at this more, the map of tools is just for what is available and all of the filtering happens at runtime. So we can just rely on the current behavior for the list of tools (it was already a matching set) and we can simplify all of the code paths again where we were adding this filtered list. Release Notes: - N/A