Simplify parsing rules for expressions
Revise spec