diff --git a/proto/python-diffs.proto b/proto/python-diffs.proto
index e388f3ae8..d84cad243 100644
--- a/proto/python-diffs.proto
+++ b/proto/python-diffs.proto
@@ -56,76 +56,75 @@ message PythonSyntax {
     Comprehension comprehension = 3;
     Decorator decorator = 4;
     Function function = 5;
-    Variable variable = 6;
-    Plus plus = 7;
-    Minus minus = 8;
-    Times times = 9;
-    DividedBy dividedBy = 10;
-    Modulo modulo = 11;
-    Power power = 12;
-    Negate negate = 13;
-    FloorDivision floorDivision = 14;
-    And and = 15;
-    Not not = 16;
-    Or or = 17;
-    XOr xOr = 18;
-    BAnd bAnd = 19;
-    BOr bOr = 20;
-    BXOr bXOr = 21;
-    LShift lShift = 22;
-    RShift rShift = 23;
-    Complement complement = 24;
-    Call call = 25;
-    LessThan lessThan = 26;
-    LessThanEqual lessThanEqual = 27;
-    GreaterThan greaterThan = 28;
-    GreaterThanEqual greaterThanEqual = 29;
-    Equal equal = 30;
-    StrictEqual strictEqual = 31;
-    Comparison comparison = 32;
-    Enumeration enumeration = 33;
-    ScopeResolution scopeResolution = 34;
-    MemberAccess memberAccess = 35;
-    Subscript subscript = 36;
-    Member member = 37;
-    Array array = 38;
-    Boolean boolean = 39;
-    Float float = 40;
-    Hash hash = 41;
-    Integer integer = 42;
-    KeyValue keyValue = 43;
-    Null null = 44;
-    Set set = 45;
-    String string = 46;
-    TextElement textElement = 47;
-    Tuple tuple = 48;
-    Redirect redirect = 49;
-    Assignment assignment = 50;
-    Break break = 51;
-    Catch catch = 52;
-    Continue continue = 53;
-    Else else = 54;
-    Finally finally = 55;
-    ForEach forEach = 56;
-    If if = 57;
-    Let let = 58;
-    NoOp noOp = 59;
-    Return return = 60;
-    Statements statements = 61;
-    Throw throw = 62;
-    Try try = 63;
-    While while = 64;
-    Yield yield = 65;
-    Ellipsis ellipsis = 66;
-    Import import = 67;
-    QualifiedImport qualifiedImport = 68;
-    QualifiedAliasedImport qualifiedAliasedImport = 69;
-    Context context = 70;
-    Empty empty = 71;
-    Error error = 72;
-    Identifier identifier = 73;
-    Annotation annotation = 74;
-    List list = 75;
+    Plus plus = 6;
+    Minus minus = 7;
+    Times times = 8;
+    DividedBy dividedBy = 9;
+    Modulo modulo = 10;
+    Power power = 11;
+    Negate negate = 12;
+    FloorDivision floorDivision = 13;
+    And and = 14;
+    Not not = 15;
+    Or or = 16;
+    XOr xOr = 17;
+    BAnd bAnd = 18;
+    BOr bOr = 19;
+    BXOr bXOr = 20;
+    LShift lShift = 21;
+    RShift rShift = 22;
+    Complement complement = 23;
+    Call call = 24;
+    LessThan lessThan = 25;
+    LessThanEqual lessThanEqual = 26;
+    GreaterThan greaterThan = 27;
+    GreaterThanEqual greaterThanEqual = 28;
+    Equal equal = 29;
+    StrictEqual strictEqual = 30;
+    Comparison comparison = 31;
+    Enumeration enumeration = 32;
+    ScopeResolution scopeResolution = 33;
+    MemberAccess memberAccess = 34;
+    Subscript subscript = 35;
+    Member member = 36;
+    Array array = 37;
+    Boolean boolean = 38;
+    Float float = 39;
+    Hash hash = 40;
+    Integer integer = 41;
+    KeyValue keyValue = 42;
+    Null null = 43;
+    Set set = 44;
+    String string = 45;
+    TextElement textElement = 46;
+    Tuple tuple = 47;
+    Redirect redirect = 48;
+    Assignment assignment = 49;
+    Break break = 50;
+    Catch catch = 51;
+    Continue continue = 52;
+    Else else = 53;
+    Finally finally = 54;
+    ForEach forEach = 55;
+    If if = 56;
+    Let let = 57;
+    NoOp noOp = 58;
+    Return return = 59;
+    Statements statements = 60;
+    Throw throw = 61;
+    Try try = 62;
+    While while = 63;
+    Yield yield = 64;
+    Ellipsis ellipsis = 65;
+    Import import = 66;
+    QualifiedImport qualifiedImport = 67;
+    QualifiedAliasedImport qualifiedAliasedImport = 68;
+    Context context = 69;
+    Empty empty = 70;
+    Error error = 71;
+    Identifier identifier = 72;
+    Annotation annotation = 73;
+    List list = 74;
   }
 }
 
diff --git a/proto/python-terms.proto b/proto/python-terms.proto
index c007f40d9..e19eea2ec 100644
--- a/proto/python-terms.proto
+++ b/proto/python-terms.proto
@@ -38,76 +38,75 @@ message PythonSyntax {
     Comprehension comprehension = 3;
     Decorator decorator = 4;
     Function function = 5;
-    Variable variable = 6;
-    Plus plus = 7;
-    Minus minus = 8;
-    Times times = 9;
-    DividedBy dividedBy = 10;
-    Modulo modulo = 11;
-    Power power = 12;
-    Negate negate = 13;
-    FloorDivision floorDivision = 14;
-    And and = 15;
-    Not not = 16;
-    Or or = 17;
-    XOr xOr = 18;
-    BAnd bAnd = 19;
-    BOr bOr = 20;
-    BXOr bXOr = 21;
-    LShift lShift = 22;
-    RShift rShift = 23;
-    Complement complement = 24;
-    Call call = 25;
-    LessThan lessThan = 26;
-    LessThanEqual lessThanEqual = 27;
-    GreaterThan greaterThan = 28;
-    GreaterThanEqual greaterThanEqual = 29;
-    Equal equal = 30;
-    StrictEqual strictEqual = 31;
-    Comparison comparison = 32;
-    Enumeration enumeration = 33;
-    ScopeResolution scopeResolution = 34;
-    MemberAccess memberAccess = 35;
-    Subscript subscript = 36;
-    Member member = 37;
-    Array array = 38;
-    Boolean boolean = 39;
-    Float float = 40;
-    Hash hash = 41;
-    Integer integer = 42;
-    KeyValue keyValue = 43;
-    Null null = 44;
-    Set set = 45;
-    String string = 46;
-    TextElement textElement = 47;
-    Tuple tuple = 48;
-    Redirect redirect = 49;
-    Assignment assignment = 50;
-    Break break = 51;
-    Catch catch = 52;
-    Continue continue = 53;
-    Else else = 54;
-    Finally finally = 55;
-    ForEach forEach = 56;
-    If if = 57;
-    Let let = 58;
-    NoOp noOp = 59;
-    Return return = 60;
-    Statements statements = 61;
-    Throw throw = 62;
-    Try try = 63;
-    While while = 64;
-    Yield yield = 65;
-    Ellipsis ellipsis = 66;
-    Import import = 67;
-    QualifiedImport qualifiedImport = 68;
-    QualifiedAliasedImport qualifiedAliasedImport = 69;
-    Context context = 70;
-    Empty empty = 71;
-    Error error = 72;
-    Identifier identifier = 73;
-    Annotation annotation = 74;
-    List list = 75;
+    Plus plus = 6;
+    Minus minus = 7;
+    Times times = 8;
+    DividedBy dividedBy = 9;
+    Modulo modulo = 10;
+    Power power = 11;
+    Negate negate = 12;
+    FloorDivision floorDivision = 13;
+    And and = 14;
+    Not not = 15;
+    Or or = 16;
+    XOr xOr = 17;
+    BAnd bAnd = 18;
+    BOr bOr = 19;
+    BXOr bXOr = 20;
+    LShift lShift = 21;
+    RShift rShift = 22;
+    Complement complement = 23;
+    Call call = 24;
+    LessThan lessThan = 25;
+    LessThanEqual lessThanEqual = 26;
+    GreaterThan greaterThan = 27;
+    GreaterThanEqual greaterThanEqual = 28;
+    Equal equal = 29;
+    StrictEqual strictEqual = 30;
+    Comparison comparison = 31;
+    Enumeration enumeration = 32;
+    ScopeResolution scopeResolution = 33;
+    MemberAccess memberAccess = 34;
+    Subscript subscript = 35;
+    Member member = 36;
+    Array array = 37;
+    Boolean boolean = 38;
+    Float float = 39;
+    Hash hash = 40;
+    Integer integer = 41;
+    KeyValue keyValue = 42;
+    Null null = 43;
+    Set set = 44;
+    String string = 45;
+    TextElement textElement = 46;
+    Tuple tuple = 47;
+    Redirect redirect = 48;
+    Assignment assignment = 49;
+    Break break = 50;
+    Catch catch = 51;
+    Continue continue = 52;
+    Else else = 53;
+    Finally finally = 54;
+    ForEach forEach = 55;
+    If if = 56;
+    Let let = 57;
+    NoOp noOp = 58;
+    Return return = 59;
+    Statements statements = 60;
+    Throw throw = 61;
+    Try try = 62;
+    While while = 63;
+    Yield yield = 64;
+    Ellipsis ellipsis = 65;
+    Import import = 66;
+    QualifiedImport qualifiedImport = 67;
+    QualifiedAliasedImport qualifiedAliasedImport = 68;
+    Context context = 69;
+    Empty empty = 70;
+    Error error = 71;
+    Identifier identifier = 72;
+    Annotation annotation = 73;
+    List list = 74;
   }
 }
 
@@ -140,12 +139,6 @@ message Function {
   PythonTerm functionBody = 4;
 }
 
-message Variable {
-  PythonTerm variableName = 1;
-  PythonTerm variableType = 2;
-  PythonTerm variableValue = 3;
-}
-
 message Plus {
   PythonTerm lhs = 1;
   PythonTerm rhs = 2;