Improving discrimination of classes vs constants within AutoImport