diff --git a/src/compile.rs b/src/compile.rs
index bddf3d6..0278f1c 100644
--- a/src/compile.rs
+++ b/src/compile.rs
@@ -1082,7 +1082,12 @@ impl Compiler {
         }
         for var in &*code.freevars {
             let table = self.symbol_table_stack.last().unwrap();
-            let symbol = table.lookup(var).unwrap();
+            let symbol = table.lookup(var).unwrap_or_else(|| {
+                panic!(
+                    "couldn't look up var {} in {} in {}",
+                    var, code.obj_name, self.source_path
+                )
+            });
             let parent_code = self.code_stack.last().unwrap();
             let vars = match symbol.scope {
                 SymbolScope::Free => &parent_code.freevar_cache,
@@ -1984,7 +1989,7 @@ impl Compiler {
                         unpack: false,
                     }),
                     generators,
-                    &mut |compiler| {
+                    &|compiler| {
                         compiler.compile_comprehension_element(elt)?;
                         compiler.emit(Instruction::ListAppend {
                             i: (1 + generators.len()) as u32,
@@ -2001,7 +2006,7 @@ impl Compiler {
                         unpack: false,
                     }),
                     generators,
-                    &mut |compiler| {
+                    &|compiler| {
                         compiler.compile_comprehension_element(elt)?;
                         compiler.emit(Instruction::SetAdd {
                             i: (1 + generators.len()) as u32,
@@ -2023,7 +2028,7 @@ impl Compiler {
                         unpack: false,
                     }),
                     generators,
-                    &mut |compiler| {
+                    &|compiler| {
                         // changed evaluation order for Py38 named expression PEP 572
                         compiler.compile_expression(key)?;
                         compiler.compile_expression(value)?;
@@ -2037,7 +2042,7 @@ impl Compiler {
                 )?;
             }
             GeneratorExp { elt, generators } => {
-                self.compile_comprehension("<genexpr>", None, generators, &mut |compiler| {
+                self.compile_comprehension("<genexpr>", None, generators, &|compiler| {
                     compiler.compile_comprehension_element(elt)?;
                     compiler.mark_generator();
                     compiler.emit(Instruction::YieldValue);
@@ -2046,9 +2051,6 @@ impl Compiler {
                     Ok(())
                 })?;
             }
-            // Comprehension { kind, generators } => {
-            //     self.compile_comprehension(kind, generators)?;
-            // }
             Starred { .. } => {
                 return Err(self.error(CompileErrorType::InvalidStarExpr));
             }
diff --git a/src/symboltable.rs b/src/symboltable.rs
index 096e2dd..2245f33 100644
--- a/src/symboltable.rs
+++ b/src/symboltable.rs
@@ -358,15 +358,11 @@ impl SymbolTableAnalyzer {
     }
 
     fn found_in_outer_scope(&mut self, name: &str) -> Option<SymbolScope> {
-        // Interesting stuff about the __class__ variable:
-        // https://docs.python.org/3/reference/datamodel.html?highlight=__class__#creating-the-class-object
-        if name == "__class__" {
-            return Some(SymbolScope::Free);
-        }
-
         let mut decl_depth = None;
         for (i, (symbols, typ)) in self.tables.iter().rev().enumerate() {
-            if let SymbolTableType::Class | SymbolTableType::Module = typ {
+            if matches!(typ, SymbolTableType::Module)
+                || matches!(typ, SymbolTableType::Class if name != "__class__")
+            {
                 continue;
             }
             if let Some(sym) = symbols.get(name) {
@@ -958,6 +954,8 @@ impl SymbolTableBuilder {
                         self.register_name(id, SymbolUsage::Iter, location)?;
                     }
                 }
+                // Interesting stuff about the __class__ variable:
+                // https://docs.python.org/3/reference/datamodel.html?highlight=__class__#creating-the-class-object
                 if context == ExpressionContext::Load
                     && self.tables.last().unwrap().typ == SymbolTableType::Function
                     && id == "super"