It's only small overhead, but I'll close this PR (I want to fix something else though in a different branch).