More updates about auto-imports.