A bit more progress on decoupling import.