This seems long overdue and aside from some redundant import warnings likely low breakage risk


Thoughts?