Update to work with import as statements.