Changed parser (to parboiled2), simplified expr grammar. Maxtest 3s.