Minor import re-arrangement.