> I can put the changes in a separate PR if that makes more sense.

I think they're fine here, just wanted to know if/how they were related to the rest.