Make imports conform to PEP328.