> I'll submit it as a separate PR

Just stick it in this one, it is introduced for this change so I don't see that as a problem. It is only a 2 line method so shouldn't be too much effort.