I might agree, my original commits in the pull request use that approach.
But I lack the overview to decide this so I think I'll leave the discussion
on what route is preferred to you @skirpichev and @asmeurer