That's reasonable, but I know that I've used them in upstream PRs so I'm gonna leave them here and refactor later so I don't have to deal with conflicts.