Rewrite parser for Expression & fix bug in Term