Cleaned up completion of qualified and local names.