Oh, didn't see your comment before leaving mine on the updated version, sorry.

We may also add a TODO here if you would prefer to fix it in a follow-up patch and merge it as it is.