The approach you suggested sounds reasonable to me.

No need to do it as part of this PR so feel free to do it later in a separate PR.