This is not used for the moment, but I guess this is what you were thinking of using as stop gap solution to make sure that registered handlers are deregistered? It's a bit of duplication and extra memory consumption but I don't think it'd be too bad at this point.