Thanks for your reply Thomas.
It makes sense to wait for this refactor to land before attempting to reduce complexity/maintenance burden on our side. Can you share any information about when this refactoring is planned for? Is there a place where we can keep ourselves informed?