Removed unnecessary imports that were causing circularities in the import graph, fixed match that was using in-scope name
Added tracking of unimported names to improve error messages