Sounds like a good improvement, but not trivial. New GH issue?