Remove some asserts
Reindent the parser
Update the TODO