I considered something like that and preferred the version in the PR. Yes it's duplicating work, but it's a small amount and reads a lot cleaner.