I'm still in review of your patch now. At most it seems ok, but are you really need both eq_sources and eq_derives lists now?
Didn't we just have this conversation? eq_sources needs to be kept separate to support the "broken EC" logic. We don't want to be regurgitating derived clauses as well as originals in that path.