See this comment in #4100 for context.

I think this would best be done a few types at a time. Otherwise, we may get merge conflicts from other PRs that invalidates the work made towards this issue.