Minor import clean-up.