if you think this would be a generally applicable improvement, feel free to file an issue and we can see what the community wants