Remove an old Py2.5-ism
Start in on star import eradication