Minor import refactoring.