As per your comment asking for another way to do this (it's not showing up in the pull request any more. Weird!):

I think this is fine. I  can't think of any substantially better way to do this :)