I will, in a dedicated follow-up PR. That's messy refactoring, but it should be done, yes.