Minor cleanup after import.