> Is that more appropriate for a separate PR?

Probably. Thanks