We could at least check if module type is sink. Then only sinks containing routers would be impacted. The edge case would be if a router unintentionally returned a named channel...