At this point, I've come to live with it. I do use Supercharge[1] to fix some of the warts.

[1]: https://sindresorhus.com/supercharge