I think we should, but in a new PR; this one has lived so long there are two upstream PRs based on it and I think that significant of a change might incur some unnecessary conflicts.