True, we should. I've left it out for the other tasks, so I'm wondering if that should be done in a separate PR once this one lands? Happy to make a ticket.