That's a good point, but I think I'll pursue it in a separate follow-up commit. I find it clearer if the commit referencing a ticket confines itself to the changes relevant to that ticket, and refactorings are done separately.