I’ll leave it as is for now, because I don’t see a clear down-side to my approach and the change is somewhat cosmetic, so it can also be done after RC1