diff --git a/Parser/Python.asdl b/Parser/Python.asdl
index 8686709..b4dd792 100644
--- a/Parser/Python.asdl
+++ b/Parser/Python.asdl
@@ -101,11 +101,8 @@
 	comprehension = (expr target, expr iter, expr* ifs)
 
 	-- not sure what to call the first argument for raise and except
-	-- TODO(jhylton): Figure out if there is a better way to handle
-	--                lineno and col_offset fields, particularly when
-        --                ast is exposed to Python.
-	excepthandler = (expr? type, identifier? name, stmt* body, int lineno,
-	                 int col_offset)
+	excepthandler = ExceptHandler(expr? type, identifier? name, stmt* body)
+	                attributes (int lineno, int col_offset)
 
 	arguments = (arg* args, identifier? vararg, expr? varargannotation,
                      arg* kwonlyargs, identifier? kwarg,